Moving src/webrtc into src/.
In order to eliminate the WebRTC Subtree mirror in Chromium,
WebRTC is moving the content of the src/webrtc directory up
to the src/ directory.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iac59c5b51b950f174119565bac87955a7994bc38
Reviewed-on: https://webrtc-review.googlesource.com/1560
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19845}diff --git a/BUILD.gn b/BUILD.gn
index 19a60d5..6641e2f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,16 +6,549 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("webrtc/webrtc.gni")
+import("//build/config/linux/pkg_config.gni")
+import("//build/config/sanitizers/sanitizers.gni")
+import("webrtc.gni")
+import("//third_party/protobuf/proto_library.gni")
+if (is_android) {
+ import("//build/config/android/config.gni")
+ import("//build/config/android/rules.gni")
+}
-group("default") {
- testonly = true
- deps = [
- "//webrtc",
- "//webrtc/examples",
- "//webrtc/rtc_tools",
- ]
+if (!build_with_chromium) {
+ group("default") {
+ testonly = true
+ deps = [
+ ":webrtc",
+ "examples",
+ "rtc_tools",
+ ]
+ if (rtc_include_tests) {
+ deps += [ ":webrtc_tests" ]
+ }
+ }
+}
+
+# Contains the defines and includes in common.gypi that are duplicated both as
+# target_defaults and direct_dependent_settings.
+config("common_inherited_config") {
+ defines = []
+ cflags = []
+ ldflags = []
+ if (build_with_mozilla) {
+ defines += [ "WEBRTC_MOZILLA_BUILD" ]
+ }
+
+ # Some tests need to declare their own trace event handlers. If this define is
+ # not set, the first time TRACE_EVENT_* is called it will store the return
+ # value for the current handler in an static variable, so that subsequent
+ # changes to the handler for that TRACE_EVENT_* will be ignored.
+ # So when tests are included, we set this define, making it possible to use
+ # different event handlers in different tests.
if (rtc_include_tests) {
- deps += [ "//webrtc:webrtc_tests" ]
+ defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1" ]
+ } else {
+ defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
+ }
+ if (build_with_chromium) {
+ defines += [
+ # TODO(kjellander): Cleanup unused ones and move defines closer to
+ # the source when webrtc:4256 is completed.
+ "FEATURE_ENABLE_VOICEMAIL",
+ "GTEST_RELATIVE_PATH",
+ "WEBRTC_CHROMIUM_BUILD",
+ ]
+ include_dirs = [
+ # The overrides must be included first as that is the mechanism for
+ # selecting the override headers in Chromium.
+ "../webrtc_overrides",
+
+ # Allow includes to be prefixed with webrtc/ in case it is not an
+ # immediate subdirectory of the top-level.
+ ".",
+ ]
+ }
+ if (is_posix) {
+ defines += [ "WEBRTC_POSIX" ]
+ }
+ if (is_ios) {
+ defines += [
+ "WEBRTC_MAC",
+ "WEBRTC_IOS",
+ ]
+ }
+ if (is_linux) {
+ defines += [ "WEBRTC_LINUX" ]
+ }
+ if (is_mac) {
+ defines += [ "WEBRTC_MAC" ]
+ }
+ if (is_win) {
+ defines += [
+ "WEBRTC_WIN",
+ "_CRT_SECURE_NO_WARNINGS", # Suppress warnings about _vsnprinf
+ ]
+ }
+ if (is_android) {
+ defines += [
+ "WEBRTC_LINUX",
+ "WEBRTC_ANDROID",
+ ]
+ }
+ if (is_chromeos) {
+ defines += [ "CHROMEOS" ]
+ }
+
+ if (rtc_sanitize_coverage != "") {
+ assert(is_clang, "sanitizer coverage requires clang")
+ cflags += [ "-fsanitize-coverage=${rtc_sanitize_coverage}" ]
+ ldflags += [ "-fsanitize-coverage=${rtc_sanitize_coverage}" ]
+ }
+
+ if (is_ubsan) {
+ cflags += [ "-fsanitize=float-cast-overflow" ]
+ }
+
+ # TODO(GYP): Support these in GN.
+ # if (is_bsd) {
+ # defines += [ "BSD" ]
+ # }
+ # if (is_openbsd) {
+ # defines += [ "OPENBSD" ]
+ # }
+ # if (is_freebsd) {
+ # defines += [ "FREEBSD" ]
+ # }
+}
+
+config("common_config") {
+ cflags = []
+ cflags_cc = []
+ defines = []
+
+ if (rtc_enable_protobuf) {
+ defines += [ "WEBRTC_ENABLE_PROTOBUF=1" ]
+ } else {
+ defines += [ "WEBRTC_ENABLE_PROTOBUF=0" ]
+ }
+
+ if (rtc_restrict_logging) {
+ defines += [ "WEBRTC_RESTRICT_LOGGING" ]
+ }
+
+ if (rtc_include_internal_audio_device) {
+ defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ]
+ }
+
+ if (!rtc_libvpx_build_vp9) {
+ defines += [ "RTC_DISABLE_VP9" ]
+ }
+
+ if (rtc_enable_sctp) {
+ defines += [ "HAVE_SCTP" ]
+ }
+
+ if (rtc_enable_external_auth) {
+ defines += [ "ENABLE_EXTERNAL_AUTH" ]
+ }
+
+ if (build_with_chromium) {
+ defines += [
+ # NOTICE: Since common_inherited_config is used in public_configs for our
+ # targets, there's no point including the defines in that config here.
+ # TODO(kjellander): Cleanup unused ones and move defines closer to the
+ # source when webrtc:4256 is completed.
+ "HAVE_WEBRTC_VIDEO",
+ "HAVE_WEBRTC_VOICE",
+ "LOGGING_INSIDE_WEBRTC",
+ "USE_WEBRTC_DEV_BRANCH",
+ ]
+ } else {
+ if (is_posix) {
+ # Enable more warnings: -Wextra is currently disabled in Chromium.
+ cflags = [
+ "-Wextra",
+
+ # Repeat some flags that get overridden by -Wextra.
+ "-Wno-unused-parameter",
+ "-Wno-missing-field-initializers",
+ "-Wno-strict-overflow",
+ ]
+ cflags_cc = [
+ "-Wnon-virtual-dtor",
+
+ # This is enabled for clang; enable for gcc as well.
+ "-Woverloaded-virtual",
+ ]
+ }
+
+ if (is_clang) {
+ cflags += [
+ "-Wc++11-narrowing",
+ "-Wimplicit-fallthrough",
+ "-Wthread-safety",
+ "-Winconsistent-missing-override",
+ "-Wundef",
+ ]
+
+ # use_xcode_clang only refers to the iOS toolchain, host binaries use
+ # chromium's clang always.
+ if (!is_nacl &&
+ (!use_xcode_clang || current_toolchain == host_toolchain)) {
+ # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
+ # recognize.
+ cflags += [ "-Wunused-lambda-capture" ]
+ }
+ }
+ }
+
+ if (current_cpu == "arm64") {
+ defines += [ "WEBRTC_ARCH_ARM64" ]
+ defines += [ "WEBRTC_HAS_NEON" ]
+ }
+
+ if (current_cpu == "arm") {
+ defines += [ "WEBRTC_ARCH_ARM" ]
+ if (arm_version >= 7) {
+ defines += [ "WEBRTC_ARCH_ARM_V7" ]
+ if (arm_use_neon) {
+ defines += [ "WEBRTC_HAS_NEON" ]
+ }
+ }
+ }
+
+ if (current_cpu == "mipsel") {
+ defines += [ "MIPS32_LE" ]
+ if (mips_float_abi == "hard") {
+ defines += [ "MIPS_FPU_LE" ]
+ }
+ if (mips_arch_variant == "r2") {
+ defines += [ "MIPS32_R2_LE" ]
+ }
+ if (mips_dsp_rev == 1) {
+ defines += [ "MIPS_DSP_R1_LE" ]
+ } else if (mips_dsp_rev == 2) {
+ defines += [
+ "MIPS_DSP_R1_LE",
+ "MIPS_DSP_R2_LE",
+ ]
+ }
+ }
+
+ if (is_android && !is_clang) {
+ # The Android NDK doesn"t provide optimized versions of these
+ # functions. Ensure they are disabled for all compilers.
+ cflags += [
+ "-fno-builtin-cos",
+ "-fno-builtin-sin",
+ "-fno-builtin-cosf",
+ "-fno-builtin-sinf",
+ ]
+ }
+
+ if (use_libfuzzer || use_drfuzz || use_afl) {
+ # Used in Chromium's overrides to disable logging
+ defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ]
+ }
+}
+
+config("common_objc") {
+ libs = [ "Foundation.framework" ]
+}
+
+if (!build_with_chromium) {
+ # Target to build all the WebRTC production code.
+ rtc_static_library("webrtc") {
+ # Only the root target should depend on this.
+ visibility = [ "//:default" ]
+
+ sources = []
+ complete_static_lib = true
+ defines = []
+
+ deps = [
+ ":webrtc_common",
+ "api",
+ "api:transport_api",
+ "audio",
+ "call",
+ "common_audio",
+ "common_video",
+ "logging",
+ "media",
+ "modules",
+ "modules/video_capture:video_capture_internal_impl",
+ "ortc",
+ "p2p",
+ "pc",
+ "rtc_base",
+ "sdk",
+ "stats",
+ "system_wrappers:system_wrappers_default",
+ "video",
+ "voice_engine",
+ ]
+
+ if (rtc_enable_protobuf) {
+ defines += [ "ENABLE_RTC_EVENT_LOG" ]
+ deps += [ "logging:rtc_event_log_proto" ]
+ }
+ }
+
+ if (rtc_include_tests) {
+ # Target to build all the WebRTC tests (but not examples or tools).
+ # Executable in order to get a target that links all WebRTC code.
+ rtc_executable("webrtc_tests") {
+ testonly = true
+
+ # Only the root target should depend on this.
+ visibility = [ "//:default" ]
+
+ deps = [
+ ":rtc_unittests",
+ ":video_engine_tests",
+ ":webrtc_nonparallel_tests",
+ ":webrtc_perf_tests",
+ "common_audio:common_audio_unittests",
+ "common_video:common_video_unittests",
+ "media:rtc_media_unittests",
+ "modules:modules_tests",
+ "modules:modules_unittests",
+ "modules/audio_coding:audio_coding_tests",
+ "modules/audio_processing:audio_processing_tests",
+ "modules/remote_bitrate_estimator:bwe_simulations_tests",
+ "modules/rtp_rtcp:test_packet_masks_metrics",
+ "modules/video_capture:video_capture_internal_impl",
+ "ortc:ortc_unittests",
+ "pc:peerconnection_unittests",
+ "pc:rtc_pc_unittests",
+ "rtc_base:rtc_base_tests_utils",
+ "stats:rtc_stats_unittests",
+ "system_wrappers:system_wrappers_unittests",
+ "test",
+ "video:screenshare_loopback",
+ "video:video_loopback",
+ "voice_engine:voice_engine_unittests",
+ ]
+ if (is_android) {
+ deps += [
+ ":android_junit_tests",
+ "sdk/android:libjingle_peerconnection_android_unittest",
+ ]
+ } else {
+ deps += [ "modules/video_capture:video_capture_tests" ]
+ }
+ if (!is_ios) {
+ deps += [ "voice_engine:voe_auto_test" ]
+ }
+ if (rtc_enable_protobuf) {
+ deps += [
+ "audio:low_bandwidth_audio_test",
+ "logging:rtc_event_log2rtp_dump",
+ ]
+ }
+ }
+ }
+}
+
+rtc_static_library("webrtc_common") {
+ # TODO(mbonadei): Remove (bugs.webrtc.org/7745)
+ # Enabling GN check triggers cyclic dependency error:
+ # :webrtc_common ->
+ # api:video_frame_api ->
+ # system_wrappers:system_wrappers ->
+ # webrtc_common
+ check_includes = false
+ sources = [
+ "common_types.cc",
+ "common_types.h",
+ "typedefs.h",
+ ]
+
+ if (!build_with_chromium && is_clang) {
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+ }
+}
+
+if (use_libfuzzer || use_drfuzz || use_afl) {
+ # This target is only here for gn to discover fuzzer build targets under
+ # webrtc/test/fuzzers/.
+ group("webrtc_fuzzers_dummy") {
+ testonly = true
+ deps = [
+ "test/fuzzers:webrtc_fuzzer_main",
+ ]
+ }
+}
+
+if (rtc_include_tests) {
+ config("rtc_unittests_config") {
+ # GN orders flags on a target before flags from configs. The default config
+ # adds -Wall, and this flag have to be after -Wall -- so they need to
+ # come from a config and can"t be on the target directly.
+ if (is_clang) {
+ cflags = [
+ "-Wno-sign-compare",
+ "-Wno-unused-const-variable",
+ ]
+ }
+ }
+
+ rtc_test("rtc_unittests") {
+ testonly = true
+
+ deps = [
+ ":webrtc_common",
+ "api:rtc_api_unittests",
+ "api/audio_codecs/test:audio_codecs_api_unittests",
+ "p2p:libstunprober_unittests",
+ "p2p:rtc_p2p_unittests",
+ "rtc_base:rtc_base_approved_unittests",
+ "rtc_base:rtc_base_tests_main",
+ "rtc_base:rtc_base_tests_utils",
+ "rtc_base:rtc_base_unittests",
+ "rtc_base:rtc_numerics_unittests",
+ "rtc_base:rtc_task_queue_unittests",
+ "rtc_base:sequenced_task_checker_unittests",
+ "rtc_base:weak_ptr_unittests",
+ "system_wrappers:metrics_default",
+ ]
+
+ if (rtc_enable_protobuf) {
+ deps += [ "logging:rtc_event_log_tests" ]
+ }
+
+ if (is_android) {
+ deps += [ "//testing/android/native_test:native_test_support" ]
+ shard_timeout = 900
+ }
+
+ if (is_ios || is_mac) {
+ deps += [ "sdk:sdk_unittests_objc" ]
+ }
+ }
+
+ # TODO(pbos): Rename test suite, this is no longer "just" for video targets.
+ video_engine_tests_resources = [
+ "../resources/foreman_cif_short.yuv",
+ "../resources/voice_engine/audio_long16.pcm",
+ ]
+
+ if (is_ios) {
+ bundle_data("video_engine_tests_bundle_data") {
+ testonly = true
+ sources = video_engine_tests_resources
+ outputs = [
+ "{{bundle_resources_dir}}/{{source_file_part}}",
+ ]
+ }
+ }
+
+ rtc_test("video_engine_tests") {
+ testonly = true
+ deps = [
+ "audio:audio_tests",
+
+ # TODO(eladalon): call_tests aren't actually video-specific, so we
+ # should move them to a more appropriate test suite.
+ "call:call_tests",
+ "modules/video_capture",
+ "rtc_base:rtc_base_tests_utils",
+ "test:test_common",
+ "test:test_main",
+ "test:video_test_common",
+ "video:video_tests",
+ ]
+ data = video_engine_tests_resources
+ if (!build_with_chromium && is_clang) {
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+ }
+ if (is_android) {
+ deps += [ "//testing/android/native_test:native_test_native_code" ]
+ shard_timeout = 900
+ }
+ if (is_ios) {
+ deps += [ ":video_engine_tests_bundle_data" ]
+ }
+ }
+
+ webrtc_perf_tests_resources = [
+ "../resources/audio_coding/speech_mono_16kHz.pcm",
+ "../resources/audio_coding/speech_mono_32_48kHz.pcm",
+ "../resources/audio_coding/testfile32kHz.pcm",
+ "../resources/ConferenceMotion_1280_720_50.yuv",
+ "../resources/difficult_photo_1850_1110.yuv",
+ "../resources/foreman_cif.yuv",
+ "../resources/google-wifi-3mbps.rx",
+ "../resources/paris_qcif.yuv",
+ "../resources/photo_1850_1110.yuv",
+ "../resources/presentation_1850_1110.yuv",
+ "../resources/verizon4g-downlink.rx",
+ "../resources/voice_engine/audio_long16.pcm",
+ "../resources/web_screenshot_1850_1110.yuv",
+ ]
+
+ if (is_ios) {
+ bundle_data("webrtc_perf_tests_bundle_data") {
+ testonly = true
+ sources = webrtc_perf_tests_resources
+ outputs = [
+ "{{bundle_resources_dir}}/{{source_file_part}}",
+ ]
+ }
+ }
+
+ rtc_test("webrtc_perf_tests") {
+ testonly = true
+ configs += [ ":rtc_unittests_config" ]
+
+ deps = [
+ "audio:audio_perf_tests",
+ "call:call_perf_tests",
+ "modules/audio_coding:audio_coding_perf_tests",
+ "modules/audio_processing:audio_processing_perf_tests",
+ "modules/remote_bitrate_estimator:remote_bitrate_estimator_perf_tests",
+ "test:test_main",
+ "video:video_full_stack_tests",
+ ]
+
+ data = webrtc_perf_tests_resources
+ if (is_android) {
+ deps += [ "//testing/android/native_test:native_test_native_code" ]
+ shard_timeout = 2700
+ }
+ if (is_ios) {
+ deps += [ ":webrtc_perf_tests_bundle_data" ]
+ }
+ }
+
+ rtc_test("webrtc_nonparallel_tests") {
+ testonly = true
+ deps = [
+ "rtc_base:rtc_base_nonparallel_tests",
+ ]
+ if (is_android) {
+ deps += [ "//testing/android/native_test:native_test_support" ]
+ shard_timeout = 900
+ }
+ }
+
+ if (is_android) {
+ junit_binary("android_junit_tests") {
+ java_files = [
+ "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java",
+ "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java",
+ "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java",
+ "sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java",
+ ]
+
+ deps = [
+ "examples:AppRTCMobile_javalib",
+ "sdk/android:libjingle_peerconnection_java",
+ "//base:base_java_test_support",
+ ]
+ }
}
}
diff --git a/DEPS b/DEPS
index 7a1a40c..d19c70c 100644
--- a/DEPS
+++ b/DEPS
@@ -542,3 +542,38 @@
# android_tools manages the NDK.
'src/third_party/android_tools',
]
+
+# Define rules for which include paths are allowed in our source.
+include_rules = [
+ # Base is only used to build Android APK tests and may not be referenced by
+ # WebRTC production code.
+ "-base",
+ "-chromium",
+ "+external/webrtc/webrtc", # Android platform build.
+ "+gflags",
+ "+libyuv",
+ "-webrtc", # Has to be disabled; otherwise all dirs below will be allowed.
+ # Individual headers that will be moved out of here, see webrtc:4243.
+ "+webrtc/call/rtp_config.h",
+ "+webrtc/common_types.h",
+ "+webrtc/transport.h",
+ "+webrtc/typedefs.h",
+ "+webrtc/voice_engine_configurations.h",
+
+ "+WebRTC",
+ "+webrtc/api",
+ "+webrtc/modules/include",
+ "+webrtc/rtc_base",
+ "+webrtc/test",
+ "+webrtc/rtc_tools",
+]
+
+# The below rules will be removed when webrtc:4243 is fixed.
+specific_include_rules = {
+ "video_receive_stream\.h": [
+ "+webrtc/call/video_receive_stream.h",
+ ],
+ "video_send_stream\.h": [
+ "+webrtc/call/video_send_stream.h",
+ ],
+}
diff --git a/LICENSE b/LICENSE
index 57fbdb2..4c41b7b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1,29 @@
-Refer to webrtc/LICENSE.
+Copyright (c) 2011, The WebRTC project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the name of Google nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE_THIRD_PARTY b/LICENSE_THIRD_PARTY
index 2281c65..af1aa50 100644
--- a/LICENSE_THIRD_PARTY
+++ b/LICENSE_THIRD_PARTY
@@ -1 +1,458 @@
-Refer to webrtc/LICENSE_THIRD_PARTY.
+This source tree contains third party source code which is governed by third
+party licenses. Paths to the files and associated licenses are collected here.
+
+Files governed by third party licenses:
+base/base64.cc
+base/base64.h
+base/md5.cc
+base/md5.h
+base/sha1.cc
+base/sha1.h
+base/sigslot.cc
+base/sigslot.h
+common_audio/fft4g.c
+common_audio/signal_processing/spl_sqrt_floor.c
+common_audio/signal_processing/spl_sqrt_floor_arm.S
+modules/audio_coding/codecs/g711/main/source/g711.c
+modules/audio_coding/codecs/g711/main/source/g711.h
+modules/audio_coding/codecs/g722/main/source/g722_decode.c
+modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
+modules/audio_coding/codecs/g722/main/source/g722_encode.c
+modules/audio_coding/codecs/isac/main/source/fft.c
+modules/audio_device/mac/portaudio/pa_memorybarrier.h
+modules/audio_device/mac/portaudio/pa_ringbuffer.c
+modules/audio_device/mac/portaudio/pa_ringbuffer.h
+modules/audio_processing/aec/aec_rdft.c
+system_wrappers/source/condition_variable_event_win.cc
+system_wrappers/source/set_thread_name_win.h
+
+Individual licenses for each file:
+-------------------------------------------------------------------------------
+Files:
+base/base64.cc
+base/base64.h
+
+License:
+//*********************************************************************
+//* Base64 - a simple base64 encoder and decoder.
+//*
+//* Copyright (c) 1999, Bob Withers - bwit@pobox.com
+//*
+//* This code may be freely used for any purpose, either personal
+//* or commercial, provided the authors copyright notice remains
+//* intact.
+//*
+//* Enhancements by Stanley Yamane:
+//* o reverse lookup table for the decode function
+//* o reserve string buffer space in advance
+//*
+//*********************************************************************
+-------------------------------------------------------------------------------
+Files:
+base/md5.cc
+base/md5.h
+
+License:
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest. This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+-------------------------------------------------------------------------------
+Files:
+base/sha1.cc
+base/sha1.h
+
+License:
+/*
+ * SHA-1 in C
+ * By Steve Reid <sreid@sea-to-sky.net>
+ * 100% Public Domain
+ *
+ * -----------------
+ * Modified 7/98
+ * By James H. Brown <jbrown@burgoyne.com>
+ * Still 100% Public Domain
+ *
+-------------------------------------------------------------------------------
+Files:
+base/sigslot.cc
+base/sigslot.h
+
+License:
+// sigslot.h: Signal/Slot classes
+//
+// Written by Sarah Thompson (sarah@telergy.com) 2002.
+//
+// License: Public domain. You are free to use this code however you like, with
+// the proviso that the author takes on no responsibility or liability for any
+// use.
+-------------------------------------------------------------------------------
+Files:
+common_audio/signal_processing/spl_sqrt_floor.c
+common_audio/signal_processing/spl_sqrt_floor_arm.S
+
+License:
+/*
+ * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
+ * license.
+ *
+ * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
+ * Date: Fri, Jun 24, 2011 at 3:20 AM
+ * Subject: Re: sqrt routine
+ * To: Kevin Ma <kma@google.com>
+ * Hi Kevin,
+ * Thanks for asking. Those routines are public domain (originally posted to
+ * comp.sys.arm a long time ago), so you can use them freely for any purpose.
+ * Cheers,
+ * Wilco
+ *
+ * ----- Original Message -----
+ * From: "Kevin Ma" <kma@google.com>
+ * To: <Wilco.Dijkstra@ntlworld.com>
+ * Sent: Thursday, June 23, 2011 11:44 PM
+ * Subject: Fwd: sqrt routine
+ * Hi Wilco,
+ * I saw your sqrt routine from several web sites, including
+ * http://www.finesse.demon.co.uk/steven/sqrt.html.
+ * Just wonder if there's any copyright information with your Successive
+ * approximation routines, or if I can freely use it for any purpose.
+ * Thanks.
+ * Kevin
+ */
+-------------------------------------------------------------------------------
+Files:
+modules/audio_coding/codecs/g711/main/source/g711.c
+modules/audio_coding/codecs/g711/main/source/g711.h
+
+License:
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * g711.h - In line A-law and u-law conversion routines
+ *
+ * Written by Steve Underwood <steveu@coppice.org>
+ *
+ * Copyright (C) 2001 Steve Underwood
+ *
+ * Despite my general liking of the GPL, I place this code in the
+ * public domain for the benefit of all mankind - even the slimy
+ * ones who might try to proprietize my work and use it to my
+ * detriment.
+ */
+-------------------------------------------------------------------------------
+Files:
+modules/audio_coding/codecs/g722/main/source/g722_decode.c
+modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
+modules/audio_coding/codecs/g722/main/source/g722_encode.c
+
+License:
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * g722_decode.c - The ITU G.722 codec, decode part.
+ *
+ * Written by Steve Underwood <steveu@coppice.org>
+ *
+ * Copyright (C) 2005 Steve Underwood
+ *
+ * Despite my general liking of the GPL, I place my own contributions
+ * to this code in the public domain for the benefit of all mankind -
+ * even the slimy ones who might try to proprietize my work and use it
+ * to my detriment.
+ *
+ * Based in part on a single channel G.722 codec which is:
+ *
+ * Copyright (c) CMU 1993
+ * Computer Science, Speech Group
+ * Chengxiang Lu and Alex Hauptmann
+ */
+-------------------------------------------------------------------------------
+Files:
+modules/audio_coding/codecs/isac/main/source/fft.c
+
+License:
+/*
+ * Copyright(c)1995,97 Mark Olesen <olesen@me.QueensU.CA>
+ * Queen's Univ at Kingston (Canada)
+ *
+ * Permission to use, copy, modify, and distribute this software for
+ * any purpose without fee is hereby granted, provided that this
+ * entire notice is included in all copies of any software which is
+ * or includes a copy or modification of this software and in all
+ * copies of the supporting documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR QUEEN'S
+ * UNIVERSITY AT KINGSTON MAKES ANY REPRESENTATION OR WARRANTY OF ANY
+ * KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
+ * FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ * All of which is to say that you can do what you like with this
+ * source code provided you don't try to sell it as your own and you
+ * include an unaltered copy of this message (including the
+ * copyright).
+ *
+ * It is also implicitly understood that bug fixes and improvements
+ * should make their way back to the general Internet community so
+ * that everyone benefits.
+ */
+-------------------------------------------------------------------------------
+Files:
+modules/audio_device/mac/portaudio/pa_memorybarrier.h
+modules/audio_device/mac/portaudio/pa_ringbuffer.c
+modules/audio_device/mac/portaudio/pa_ringbuffer.h
+
+License:
+/*
+ * $Id: pa_memorybarrier.h 1240 2007-07-17 13:05:07Z bjornroche $
+ * Portable Audio I/O Library
+ * Memory barrier utilities
+ *
+ * Author: Bjorn Roche, XO Audio, LLC
+ *
+ * This program uses the PortAudio Portable Audio Library.
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/*
+ * $Id: pa_ringbuffer.c 1421 2009-11-18 16:09:05Z bjornroche $
+ * Portable Audio I/O Library
+ * Ring Buffer utility.
+ *
+ * Author: Phil Burk, http://www.softsynth.com
+ * modified for SMP safety on Mac OS X by Bjorn Roche
+ * modified for SMP safety on Linux by Leland Lucius
+ * also, allowed for const where possible
+ * modified for multiple-byte-sized data elements by Sven Fischer
+ *
+ * Note that this is safe only for a single-thread reader and a
+ * single-thread writer.
+ *
+ * This program uses the PortAudio Portable Audio Library.
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+-------------------------------------------------------------------------------
+Files:
+common_audio/fft4g.c
+modules/audio_processing/aec/aec_rdft.c
+
+License:
+/*
+ * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
+ * Copyright Takuya OOURA, 1996-2001
+ *
+ * You may use, copy, modify and distribute this code for any purpose (include
+ * commercial use) and without fee. Please refer to this package when you modify
+ * this code.
+ */
+-------------------------------------------------------------------------------
+Files:
+system_wrappers/source/condition_variable_event_win.cc
+
+Source:
+http://www1.cse.wustl.edu/~schmidt/ACE-copying.html
+
+License:
+Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM),
+and CoSMIC(TM)
+
+ACE(TM), TAO(TM), CIAO(TM), DAnCE>(TM), and CoSMIC(TM) (henceforth referred to
+as "DOC software") are copyrighted by Douglas C. Schmidt and his research
+group at Washington University, University of California, Irvine, and
+Vanderbilt University, Copyright (c) 1993-2009, all rights reserved. Since DOC
+software is open-source, freely available software, you are free to use,
+modify, copy, and distribute--perpetually and irrevocably--the DOC software
+source code and object code produced from the source, as well as copy and
+distribute modified versions of this software. You must, however, include this
+copyright statement along with any code built using DOC software that you
+release. No copyright statement needs to be provided if you just ship binary
+executables of your software products.
+You can use DOC software in commercial and/or binary software releases and are
+under no obligation to redistribute any of your source code that is built
+using DOC software. Note, however, that you may not misappropriate the DOC
+software code, such as copyrighting it yourself or claiming authorship of the
+DOC software code, in a way that will prevent DOC software from being
+distributed freely using an open-source development model. You needn't inform
+anyone that you're using DOC software in your software, though we encourage
+you to let us know so we can promote your project in the DOC software success
+stories.
+
+The ACE, TAO, CIAO, DAnCE, and CoSMIC web sites are maintained by the DOC
+Group at the Institute for Software Integrated Systems (ISIS) and the Center
+for Distributed Object Computing of Washington University, St. Louis for the
+development of open-source software as part of the open-source software
+community. Submissions are provided by the submitter ``as is'' with no
+warranties whatsoever, including any warranty of merchantability,
+noninfringement of third party intellectual property, or fitness for any
+particular purpose. In no event shall the submitter be liable for any direct,
+indirect, special, exemplary, punitive, or consequential damages, including
+without limitation, lost profits, even if advised of the possibility of such
+damages. Likewise, DOC software is provided as is with no warranties of any
+kind, including the warranties of design, merchantability, and fitness for a
+particular purpose, noninfringement, or arising from a course of dealing,
+usage or trade practice. Washington University, UC Irvine, Vanderbilt
+University, their employees, and students shall have no liability with respect
+to the infringement of copyrights, trade secrets or any patents by DOC
+software or any part thereof. Moreover, in no event will Washington
+University, UC Irvine, or Vanderbilt University, their employees, or students
+be liable for any lost revenue or profits or other special, indirect and
+consequential damages.
+
+DOC software is provided with no support and without any obligation on the
+part of Washington University, UC Irvine, Vanderbilt University, their
+employees, or students to assist in its use, correction, modification, or
+enhancement. A number of companies around the world provide commercial support
+for DOC software, however. DOC software is Y2K-compliant, as long as the
+underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant
+with the new US daylight savings rule passed by Congress as "The Energy Policy
+Act of 2005," which established new daylight savings times (DST) rules for the
+United States that expand DST as of March 2007. Since DOC software obtains
+time/date and calendaring information from operating systems users will not be
+affected by the new DST rules as long as they upgrade their operating systems
+accordingly.
+
+The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM), Washington
+University, UC Irvine, and Vanderbilt University, may not be used to endorse
+or promote products or services derived from this source without express
+written permission from Washington University, UC Irvine, or Vanderbilt
+University. This license grants no permission to call products or services
+derived from this source ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM),
+nor does it grant permission for the name Washington University, UC Irvine, or
+Vanderbilt University to appear in their names.
+-------------------------------------------------------------------------------
+Files:
+system_wrappers/source/set_thread_name_win.h
+
+Source:
+http://msdn.microsoft.com/en-us/cc300389.aspx#P
+
+License:
+This license governs use of code marked as “sample” or “example” available on
+this web site without a license agreement, as provided under the section above
+titled “NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE.” If you use
+such code (the “software”), you accept this license. If you do not accept the
+license, do not use the software.
+
+1. Definitions
+
+The terms “reproduce,” “reproduction,” “derivative works,” and “distribution”
+have the same meaning here as under U.S. copyright law.
+
+A “contribution” is the original software, or any additions or changes to the
+software.
+
+A “contributor” is any person that distributes its contribution under this
+license.
+
+“Licensed patents” are a contributor’s patent claims that read directly on its
+contribution.
+
+2. Grant of Rights
+
+(A) Copyright Grant - Subject to the terms of this license, including the
+license conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free copyright license to reproduce its
+contribution, prepare derivative works of its contribution, and distribute its
+contribution or any derivative works that you create.
+
+(B) Patent Grant - Subject to the terms of this license, including the license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free license under its licensed patents to
+make, have made, use, sell, offer for sale, import, and/or otherwise dispose
+of its contribution in the software or derivative works of the contribution in
+the software.
+
+3. Conditions and Limitations
+
+(A) No Trademark License- This license does not grant you rights to use any
+contributors’ name, logo, or trademarks.
+
+(B) If you bring a patent claim against any contributor over patents that you
+claim are infringed by the software, your patent license from such contributor
+to the software ends automatically.
+
+(C) If you distribute any portion of the software, you must retain all
+copyright, patent, trademark, and attribution notices that are present in the
+software.
+
+(D) If you distribute any portion of the software in source code form, you may
+do so only under this license by including a complete copy of this license
+with your distribution. If you distribute any portion of the software in
+compiled or object code form, you may only do so under a license that complies
+with this license.
+
+(E) The software is licensed “as-is.” You bear the risk of using it. The
+contributors give no express warranties, guarantees or conditions. You may
+have additional consumer rights under your local laws which this license
+cannot change. To the extent permitted under your local laws, the contributors
+exclude the implied warranties of merchantability, fitness for a particular
+purpose and non-infringement.
+
+(F) Platform Limitation - The licenses granted in sections 2(A) and 2(B)
+extend only to the software or derivative works that you create that run on a
+Microsoft Windows operating system product.
+
diff --git a/OWNERS b/OWNERS
index 1efe89f..8f877e6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,16 +2,16 @@
kwiberg@webrtc.org
mflodman@webrtc.org
niklas.enbom@webrtc.org
+stefan@webrtc.org
tina.legrand@webrtc.org
tommi@webrtc.org
per-file .gitignore=*
per-file .gn=kjellander@webrtc.org
+per-file *.gn=kjellander@webrtc.org
+per-file *.gni=kjellander@webrtc.org
per-file *.py=kjellander@webrtc.org
-per-file .vpython=kjellander@webrtc.org
per-file AUTHORS=*
per-file BUILD.gn=kjellander@webrtc.org
per-file DEPS=*
per-file pylintrc=kjellander@webrtc.org
per-file WATCHLISTS=*
-per-file style-guide.md=danilchap@webrtc.org
-per-file style-guide.md=kwiberg@webrtc.org
diff --git a/PATENTS b/PATENTS
index c76f045..190607a 100644
--- a/PATENTS
+++ b/PATENTS
@@ -1 +1,24 @@
-Refer to webrtc/PATENTS.
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the WebRTC code package.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive,
+no-charge, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import,
+transfer, and otherwise run, modify and propagate the contents of this
+implementation of the WebRTC code package, where such license applies
+only to those patent claims, both currently owned by Google and
+acquired in the future, licensable by Google that are necessarily
+infringed by this implementation of the WebRTC code package. This
+grant does not include claims that would be infringed only as a
+consequence of further modification of this implementation. If you or
+your agent or exclusive licensee institute or order or agree to the
+institution of patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that this
+implementation of the WebRTC code package or any code incorporated
+within this implementation of the WebRTC code package constitutes
+direct or contributory patent infringement, or inducement of patent
+infringement, then any patent rights granted to you under this License
+for this implementation of the WebRTC code package shall terminate as
+of the date such litigation is filed.
diff --git a/webrtc/README.chromium b/README.chromium
similarity index 100%
rename from webrtc/README.chromium
rename to README.chromium
diff --git a/webrtc/api/BUILD.gn b/api/BUILD.gn
similarity index 100%
rename from webrtc/api/BUILD.gn
rename to api/BUILD.gn
diff --git a/webrtc/api/DEPS b/api/DEPS
similarity index 100%
rename from webrtc/api/DEPS
rename to api/DEPS
diff --git a/webrtc/api/OWNERS b/api/OWNERS
similarity index 100%
rename from webrtc/api/OWNERS
rename to api/OWNERS
diff --git a/webrtc/api/array_view.h b/api/array_view.h
similarity index 100%
rename from webrtc/api/array_view.h
rename to api/array_view.h
diff --git a/webrtc/api/array_view_unittest.cc b/api/array_view_unittest.cc
similarity index 100%
rename from webrtc/api/array_view_unittest.cc
rename to api/array_view_unittest.cc
diff --git a/webrtc/api/audio/audio_mixer.h b/api/audio/audio_mixer.h
similarity index 100%
rename from webrtc/api/audio/audio_mixer.h
rename to api/audio/audio_mixer.h
diff --git a/webrtc/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/BUILD.gn
rename to api/audio_codecs/BUILD.gn
diff --git a/webrtc/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/L16/BUILD.gn
rename to api/audio_codecs/L16/BUILD.gn
diff --git a/webrtc/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc
similarity index 100%
rename from webrtc/api/audio_codecs/L16/audio_decoder_L16.cc
rename to api/audio_codecs/L16/audio_decoder_L16.cc
diff --git a/webrtc/api/audio_codecs/L16/audio_decoder_L16.h b/api/audio_codecs/L16/audio_decoder_L16.h
similarity index 100%
rename from webrtc/api/audio_codecs/L16/audio_decoder_L16.h
rename to api/audio_codecs/L16/audio_decoder_L16.h
diff --git a/webrtc/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc
similarity index 100%
rename from webrtc/api/audio_codecs/L16/audio_encoder_L16.cc
rename to api/audio_codecs/L16/audio_encoder_L16.cc
diff --git a/webrtc/api/audio_codecs/L16/audio_encoder_L16.h b/api/audio_codecs/L16/audio_encoder_L16.h
similarity index 100%
rename from webrtc/api/audio_codecs/L16/audio_encoder_L16.h
rename to api/audio_codecs/L16/audio_encoder_L16.h
diff --git a/webrtc/api/audio_codecs/OWNERS b/api/audio_codecs/OWNERS
similarity index 100%
rename from webrtc/api/audio_codecs/OWNERS
rename to api/audio_codecs/OWNERS
diff --git a/webrtc/api/audio_codecs/audio_decoder.cc b/api/audio_codecs/audio_decoder.cc
similarity index 100%
rename from webrtc/api/audio_codecs/audio_decoder.cc
rename to api/audio_codecs/audio_decoder.cc
diff --git a/webrtc/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_decoder.h
rename to api/audio_codecs/audio_decoder.h
diff --git a/webrtc/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_decoder_factory.h
rename to api/audio_codecs/audio_decoder_factory.h
diff --git a/webrtc/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_decoder_factory_template.h
rename to api/audio_codecs/audio_decoder_factory_template.h
diff --git a/webrtc/api/audio_codecs/audio_encoder.cc b/api/audio_codecs/audio_encoder.cc
similarity index 100%
rename from webrtc/api/audio_codecs/audio_encoder.cc
rename to api/audio_codecs/audio_encoder.cc
diff --git a/webrtc/api/audio_codecs/audio_encoder.h b/api/audio_codecs/audio_encoder.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_encoder.h
rename to api/audio_codecs/audio_encoder.h
diff --git a/webrtc/api/audio_codecs/audio_encoder_factory.h b/api/audio_codecs/audio_encoder_factory.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_encoder_factory.h
rename to api/audio_codecs/audio_encoder_factory.h
diff --git a/webrtc/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_encoder_factory_template.h
rename to api/audio_codecs/audio_encoder_factory_template.h
diff --git a/webrtc/api/audio_codecs/audio_format.cc b/api/audio_codecs/audio_format.cc
similarity index 100%
rename from webrtc/api/audio_codecs/audio_format.cc
rename to api/audio_codecs/audio_format.cc
diff --git a/webrtc/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h
similarity index 100%
rename from webrtc/api/audio_codecs/audio_format.h
rename to api/audio_codecs/audio_format.h
diff --git a/webrtc/api/audio_codecs/builtin_audio_decoder_factory.cc b/api/audio_codecs/builtin_audio_decoder_factory.cc
similarity index 100%
rename from webrtc/api/audio_codecs/builtin_audio_decoder_factory.cc
rename to api/audio_codecs/builtin_audio_decoder_factory.cc
diff --git a/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h b/api/audio_codecs/builtin_audio_decoder_factory.h
similarity index 100%
rename from webrtc/api/audio_codecs/builtin_audio_decoder_factory.h
rename to api/audio_codecs/builtin_audio_decoder_factory.h
diff --git a/webrtc/api/audio_codecs/builtin_audio_encoder_factory.cc b/api/audio_codecs/builtin_audio_encoder_factory.cc
similarity index 100%
rename from webrtc/api/audio_codecs/builtin_audio_encoder_factory.cc
rename to api/audio_codecs/builtin_audio_encoder_factory.cc
diff --git a/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h b/api/audio_codecs/builtin_audio_encoder_factory.h
similarity index 100%
rename from webrtc/api/audio_codecs/builtin_audio_encoder_factory.h
rename to api/audio_codecs/builtin_audio_encoder_factory.h
diff --git a/webrtc/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/g711/BUILD.gn
rename to api/audio_codecs/g711/BUILD.gn
diff --git a/webrtc/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc
similarity index 100%
rename from webrtc/api/audio_codecs/g711/audio_decoder_g711.cc
rename to api/audio_codecs/g711/audio_decoder_g711.cc
diff --git a/webrtc/api/audio_codecs/g711/audio_decoder_g711.h b/api/audio_codecs/g711/audio_decoder_g711.h
similarity index 100%
rename from webrtc/api/audio_codecs/g711/audio_decoder_g711.h
rename to api/audio_codecs/g711/audio_decoder_g711.h
diff --git a/webrtc/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc
similarity index 100%
rename from webrtc/api/audio_codecs/g711/audio_encoder_g711.cc
rename to api/audio_codecs/g711/audio_encoder_g711.cc
diff --git a/webrtc/api/audio_codecs/g711/audio_encoder_g711.h b/api/audio_codecs/g711/audio_encoder_g711.h
similarity index 100%
rename from webrtc/api/audio_codecs/g711/audio_encoder_g711.h
rename to api/audio_codecs/g711/audio_encoder_g711.h
diff --git a/webrtc/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/g722/BUILD.gn
rename to api/audio_codecs/g722/BUILD.gn
diff --git a/webrtc/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc
similarity index 100%
rename from webrtc/api/audio_codecs/g722/audio_decoder_g722.cc
rename to api/audio_codecs/g722/audio_decoder_g722.cc
diff --git a/webrtc/api/audio_codecs/g722/audio_decoder_g722.h b/api/audio_codecs/g722/audio_decoder_g722.h
similarity index 100%
rename from webrtc/api/audio_codecs/g722/audio_decoder_g722.h
rename to api/audio_codecs/g722/audio_decoder_g722.h
diff --git a/webrtc/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc
similarity index 100%
rename from webrtc/api/audio_codecs/g722/audio_encoder_g722.cc
rename to api/audio_codecs/g722/audio_encoder_g722.cc
diff --git a/webrtc/api/audio_codecs/g722/audio_encoder_g722.h b/api/audio_codecs/g722/audio_encoder_g722.h
similarity index 100%
rename from webrtc/api/audio_codecs/g722/audio_encoder_g722.h
rename to api/audio_codecs/g722/audio_encoder_g722.h
diff --git a/webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h b/api/audio_codecs/g722/audio_encoder_g722_config.h
similarity index 100%
rename from webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h
rename to api/audio_codecs/g722/audio_encoder_g722_config.h
diff --git a/webrtc/api/audio_codecs/ilbc/BUILD.gn b/api/audio_codecs/ilbc/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/BUILD.gn
rename to api/audio_codecs/ilbc/BUILD.gn
diff --git a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
rename to api/audio_codecs/ilbc/audio_decoder_ilbc.cc
diff --git a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h b/api/audio_codecs/ilbc/audio_decoder_ilbc.h
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h
rename to api/audio_codecs/ilbc/audio_decoder_ilbc.h
diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
rename to api/audio_codecs/ilbc/audio_encoder_ilbc.cc
diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h b/api/audio_codecs/ilbc/audio_encoder_ilbc.h
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h
rename to api/audio_codecs/ilbc/audio_encoder_ilbc.h
diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h b/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h
similarity index 100%
rename from webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h
rename to api/audio_codecs/ilbc/audio_encoder_ilbc_config.h
diff --git a/webrtc/api/audio_codecs/isac/BUILD.gn b/api/audio_codecs/isac/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/isac/BUILD.gn
rename to api/audio_codecs/isac/BUILD.gn
diff --git a/webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc b/api/audio_codecs/isac/audio_decoder_isac_fix.cc
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc
rename to api/audio_codecs/isac/audio_decoder_isac_fix.cc
diff --git a/webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.h b/api/audio_codecs/isac/audio_decoder_isac_fix.h
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.h
rename to api/audio_codecs/isac/audio_decoder_isac_fix.h
diff --git a/webrtc/api/audio_codecs/isac/audio_decoder_isac_float.cc b/api/audio_codecs/isac/audio_decoder_isac_float.cc
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_decoder_isac_float.cc
rename to api/audio_codecs/isac/audio_decoder_isac_float.cc
diff --git a/webrtc/api/audio_codecs/isac/audio_decoder_isac_float.h b/api/audio_codecs/isac/audio_decoder_isac_float.h
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_decoder_isac_float.h
rename to api/audio_codecs/isac/audio_decoder_isac_float.h
diff --git a/webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.cc b/api/audio_codecs/isac/audio_encoder_isac_fix.cc
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.cc
rename to api/audio_codecs/isac/audio_encoder_isac_fix.cc
diff --git a/webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.h b/api/audio_codecs/isac/audio_encoder_isac_fix.h
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.h
rename to api/audio_codecs/isac/audio_encoder_isac_fix.h
diff --git a/webrtc/api/audio_codecs/isac/audio_encoder_isac_float.cc b/api/audio_codecs/isac/audio_encoder_isac_float.cc
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_encoder_isac_float.cc
rename to api/audio_codecs/isac/audio_encoder_isac_float.cc
diff --git a/webrtc/api/audio_codecs/isac/audio_encoder_isac_float.h b/api/audio_codecs/isac/audio_encoder_isac_float.h
similarity index 100%
rename from webrtc/api/audio_codecs/isac/audio_encoder_isac_float.h
rename to api/audio_codecs/isac/audio_encoder_isac_float.h
diff --git a/webrtc/api/audio_codecs/opus/BUILD.gn b/api/audio_codecs/opus/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/opus/BUILD.gn
rename to api/audio_codecs/opus/BUILD.gn
diff --git a/webrtc/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc
similarity index 100%
rename from webrtc/api/audio_codecs/opus/audio_decoder_opus.cc
rename to api/audio_codecs/opus/audio_decoder_opus.cc
diff --git a/webrtc/api/audio_codecs/opus/audio_decoder_opus.h b/api/audio_codecs/opus/audio_decoder_opus.h
similarity index 100%
rename from webrtc/api/audio_codecs/opus/audio_decoder_opus.h
rename to api/audio_codecs/opus/audio_decoder_opus.h
diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus.h b/api/audio_codecs/opus/audio_encoder_opus.h
similarity index 100%
rename from webrtc/api/audio_codecs/opus/audio_encoder_opus.h
rename to api/audio_codecs/opus/audio_encoder_opus.h
diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc b/api/audio_codecs/opus/audio_encoder_opus_config.cc
similarity index 100%
rename from webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc
rename to api/audio_codecs/opus/audio_encoder_opus_config.cc
diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h b/api/audio_codecs/opus/audio_encoder_opus_config.h
similarity index 100%
rename from webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h
rename to api/audio_codecs/opus/audio_encoder_opus_config.h
diff --git a/webrtc/api/audio_codecs/test/BUILD.gn b/api/audio_codecs/test/BUILD.gn
similarity index 100%
rename from webrtc/api/audio_codecs/test/BUILD.gn
rename to api/audio_codecs/test/BUILD.gn
diff --git a/webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
similarity index 100%
rename from webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
rename to api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
diff --git a/webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
similarity index 100%
rename from webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
rename to api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
diff --git a/webrtc/api/call/audio_sink.h b/api/call/audio_sink.h
similarity index 100%
rename from webrtc/api/call/audio_sink.h
rename to api/call/audio_sink.h
diff --git a/webrtc/api/call/transport.h b/api/call/transport.h
similarity index 100%
rename from webrtc/api/call/transport.h
rename to api/call/transport.h
diff --git a/webrtc/api/datachannel.h b/api/datachannel.h
similarity index 100%
rename from webrtc/api/datachannel.h
rename to api/datachannel.h
diff --git a/webrtc/api/datachannelinterface.h b/api/datachannelinterface.h
similarity index 100%
rename from webrtc/api/datachannelinterface.h
rename to api/datachannelinterface.h
diff --git a/webrtc/api/dtmfsenderinterface.h b/api/dtmfsenderinterface.h
similarity index 100%
rename from webrtc/api/dtmfsenderinterface.h
rename to api/dtmfsenderinterface.h
diff --git a/webrtc/api/fakemetricsobserver.cc b/api/fakemetricsobserver.cc
similarity index 100%
rename from webrtc/api/fakemetricsobserver.cc
rename to api/fakemetricsobserver.cc
diff --git a/webrtc/api/fakemetricsobserver.h b/api/fakemetricsobserver.h
similarity index 100%
rename from webrtc/api/fakemetricsobserver.h
rename to api/fakemetricsobserver.h
diff --git a/webrtc/api/jsep.h b/api/jsep.h
similarity index 100%
rename from webrtc/api/jsep.h
rename to api/jsep.h
diff --git a/webrtc/api/jsepicecandidate.h b/api/jsepicecandidate.h
similarity index 100%
rename from webrtc/api/jsepicecandidate.h
rename to api/jsepicecandidate.h
diff --git a/webrtc/api/jsepsessiondescription.h b/api/jsepsessiondescription.h
similarity index 100%
rename from webrtc/api/jsepsessiondescription.h
rename to api/jsepsessiondescription.h
diff --git a/webrtc/api/mediaconstraintsinterface.cc b/api/mediaconstraintsinterface.cc
similarity index 100%
rename from webrtc/api/mediaconstraintsinterface.cc
rename to api/mediaconstraintsinterface.cc
diff --git a/webrtc/api/mediaconstraintsinterface.h b/api/mediaconstraintsinterface.h
similarity index 100%
rename from webrtc/api/mediaconstraintsinterface.h
rename to api/mediaconstraintsinterface.h
diff --git a/webrtc/api/mediastream.h b/api/mediastream.h
similarity index 100%
rename from webrtc/api/mediastream.h
rename to api/mediastream.h
diff --git a/webrtc/api/mediastreaminterface.cc b/api/mediastreaminterface.cc
similarity index 100%
rename from webrtc/api/mediastreaminterface.cc
rename to api/mediastreaminterface.cc
diff --git a/webrtc/api/mediastreaminterface.h b/api/mediastreaminterface.h
similarity index 100%
rename from webrtc/api/mediastreaminterface.h
rename to api/mediastreaminterface.h
diff --git a/webrtc/api/mediastreamproxy.h b/api/mediastreamproxy.h
similarity index 100%
rename from webrtc/api/mediastreamproxy.h
rename to api/mediastreamproxy.h
diff --git a/webrtc/api/mediastreamtrack.h b/api/mediastreamtrack.h
similarity index 100%
rename from webrtc/api/mediastreamtrack.h
rename to api/mediastreamtrack.h
diff --git a/webrtc/api/mediastreamtrackproxy.h b/api/mediastreamtrackproxy.h
similarity index 100%
rename from webrtc/api/mediastreamtrackproxy.h
rename to api/mediastreamtrackproxy.h
diff --git a/webrtc/api/mediatypes.cc b/api/mediatypes.cc
similarity index 100%
rename from webrtc/api/mediatypes.cc
rename to api/mediatypes.cc
diff --git a/webrtc/api/mediatypes.h b/api/mediatypes.h
similarity index 100%
rename from webrtc/api/mediatypes.h
rename to api/mediatypes.h
diff --git a/webrtc/api/notifier.h b/api/notifier.h
similarity index 100%
rename from webrtc/api/notifier.h
rename to api/notifier.h
diff --git a/webrtc/api/optional.cc b/api/optional.cc
similarity index 100%
rename from webrtc/api/optional.cc
rename to api/optional.cc
diff --git a/webrtc/api/optional.h b/api/optional.h
similarity index 100%
rename from webrtc/api/optional.h
rename to api/optional.h
diff --git a/webrtc/api/optional_unittest.cc b/api/optional_unittest.cc
similarity index 100%
rename from webrtc/api/optional_unittest.cc
rename to api/optional_unittest.cc
diff --git a/webrtc/api/ortc/mediadescription.cc b/api/ortc/mediadescription.cc
similarity index 100%
rename from webrtc/api/ortc/mediadescription.cc
rename to api/ortc/mediadescription.cc
diff --git a/webrtc/api/ortc/mediadescription.h b/api/ortc/mediadescription.h
similarity index 100%
rename from webrtc/api/ortc/mediadescription.h
rename to api/ortc/mediadescription.h
diff --git a/webrtc/api/ortc/mediadescription_unittest.cc b/api/ortc/mediadescription_unittest.cc
similarity index 100%
rename from webrtc/api/ortc/mediadescription_unittest.cc
rename to api/ortc/mediadescription_unittest.cc
diff --git a/webrtc/api/ortc/ortcfactoryinterface.h b/api/ortc/ortcfactoryinterface.h
similarity index 100%
rename from webrtc/api/ortc/ortcfactoryinterface.h
rename to api/ortc/ortcfactoryinterface.h
diff --git a/webrtc/api/ortc/ortcrtpreceiverinterface.h b/api/ortc/ortcrtpreceiverinterface.h
similarity index 100%
rename from webrtc/api/ortc/ortcrtpreceiverinterface.h
rename to api/ortc/ortcrtpreceiverinterface.h
diff --git a/webrtc/api/ortc/ortcrtpsenderinterface.h b/api/ortc/ortcrtpsenderinterface.h
similarity index 100%
rename from webrtc/api/ortc/ortcrtpsenderinterface.h
rename to api/ortc/ortcrtpsenderinterface.h
diff --git a/webrtc/api/ortc/packettransportinterface.h b/api/ortc/packettransportinterface.h
similarity index 100%
rename from webrtc/api/ortc/packettransportinterface.h
rename to api/ortc/packettransportinterface.h
diff --git a/webrtc/api/ortc/rtptransportcontrollerinterface.h b/api/ortc/rtptransportcontrollerinterface.h
similarity index 100%
rename from webrtc/api/ortc/rtptransportcontrollerinterface.h
rename to api/ortc/rtptransportcontrollerinterface.h
diff --git a/webrtc/api/ortc/rtptransportinterface.h b/api/ortc/rtptransportinterface.h
similarity index 100%
rename from webrtc/api/ortc/rtptransportinterface.h
rename to api/ortc/rtptransportinterface.h
diff --git a/webrtc/api/ortc/sessiondescription.cc b/api/ortc/sessiondescription.cc
similarity index 100%
rename from webrtc/api/ortc/sessiondescription.cc
rename to api/ortc/sessiondescription.cc
diff --git a/webrtc/api/ortc/sessiondescription.h b/api/ortc/sessiondescription.h
similarity index 100%
rename from webrtc/api/ortc/sessiondescription.h
rename to api/ortc/sessiondescription.h
diff --git a/webrtc/api/ortc/sessiondescription_unittest.cc b/api/ortc/sessiondescription_unittest.cc
similarity index 100%
rename from webrtc/api/ortc/sessiondescription_unittest.cc
rename to api/ortc/sessiondescription_unittest.cc
diff --git a/webrtc/api/ortc/srtptransportinterface.h b/api/ortc/srtptransportinterface.h
similarity index 100%
rename from webrtc/api/ortc/srtptransportinterface.h
rename to api/ortc/srtptransportinterface.h
diff --git a/webrtc/api/ortc/udptransportinterface.h b/api/ortc/udptransportinterface.h
similarity index 100%
rename from webrtc/api/ortc/udptransportinterface.h
rename to api/ortc/udptransportinterface.h
diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/api/peerconnectionfactoryproxy.h
similarity index 100%
rename from webrtc/api/peerconnectionfactoryproxy.h
rename to api/peerconnectionfactoryproxy.h
diff --git a/webrtc/api/peerconnectioninterface.h b/api/peerconnectioninterface.h
similarity index 100%
rename from webrtc/api/peerconnectioninterface.h
rename to api/peerconnectioninterface.h
diff --git a/webrtc/api/peerconnectionproxy.h b/api/peerconnectionproxy.h
similarity index 100%
rename from webrtc/api/peerconnectionproxy.h
rename to api/peerconnectionproxy.h
diff --git a/webrtc/api/proxy.h b/api/proxy.h
similarity index 100%
rename from webrtc/api/proxy.h
rename to api/proxy.h
diff --git a/webrtc/api/rtcerror.cc b/api/rtcerror.cc
similarity index 100%
rename from webrtc/api/rtcerror.cc
rename to api/rtcerror.cc
diff --git a/webrtc/api/rtcerror.h b/api/rtcerror.h
similarity index 100%
rename from webrtc/api/rtcerror.h
rename to api/rtcerror.h
diff --git a/webrtc/api/rtcerror_unittest.cc b/api/rtcerror_unittest.cc
similarity index 100%
rename from webrtc/api/rtcerror_unittest.cc
rename to api/rtcerror_unittest.cc
diff --git a/webrtc/api/rtpparameters.cc b/api/rtpparameters.cc
similarity index 100%
rename from webrtc/api/rtpparameters.cc
rename to api/rtpparameters.cc
diff --git a/webrtc/api/rtpparameters.h b/api/rtpparameters.h
similarity index 100%
rename from webrtc/api/rtpparameters.h
rename to api/rtpparameters.h
diff --git a/webrtc/api/rtpparameters_unittest.cc b/api/rtpparameters_unittest.cc
similarity index 100%
rename from webrtc/api/rtpparameters_unittest.cc
rename to api/rtpparameters_unittest.cc
diff --git a/webrtc/api/rtpreceiverinterface.h b/api/rtpreceiverinterface.h
similarity index 100%
rename from webrtc/api/rtpreceiverinterface.h
rename to api/rtpreceiverinterface.h
diff --git a/webrtc/api/rtpsender.h b/api/rtpsender.h
similarity index 100%
rename from webrtc/api/rtpsender.h
rename to api/rtpsender.h
diff --git a/webrtc/api/rtpsenderinterface.h b/api/rtpsenderinterface.h
similarity index 100%
rename from webrtc/api/rtpsenderinterface.h
rename to api/rtpsenderinterface.h
diff --git a/webrtc/api/stats/OWNERS b/api/stats/OWNERS
similarity index 100%
rename from webrtc/api/stats/OWNERS
rename to api/stats/OWNERS
diff --git a/webrtc/api/stats/rtcstats.h b/api/stats/rtcstats.h
similarity index 100%
rename from webrtc/api/stats/rtcstats.h
rename to api/stats/rtcstats.h
diff --git a/webrtc/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
similarity index 100%
rename from webrtc/api/stats/rtcstats_objects.h
rename to api/stats/rtcstats_objects.h
diff --git a/webrtc/api/stats/rtcstatscollectorcallback.h b/api/stats/rtcstatscollectorcallback.h
similarity index 100%
rename from webrtc/api/stats/rtcstatscollectorcallback.h
rename to api/stats/rtcstatscollectorcallback.h
diff --git a/webrtc/api/stats/rtcstatsreport.h b/api/stats/rtcstatsreport.h
similarity index 100%
rename from webrtc/api/stats/rtcstatsreport.h
rename to api/stats/rtcstatsreport.h
diff --git a/webrtc/api/statstypes.cc b/api/statstypes.cc
similarity index 100%
rename from webrtc/api/statstypes.cc
rename to api/statstypes.cc
diff --git a/webrtc/api/statstypes.h b/api/statstypes.h
similarity index 100%
rename from webrtc/api/statstypes.h
rename to api/statstypes.h
diff --git a/webrtc/api/streamcollection.h b/api/streamcollection.h
similarity index 100%
rename from webrtc/api/streamcollection.h
rename to api/streamcollection.h
diff --git a/webrtc/api/test/fakeconstraints.h b/api/test/fakeconstraints.h
similarity index 100%
rename from webrtc/api/test/fakeconstraints.h
rename to api/test/fakeconstraints.h
diff --git a/webrtc/api/test/mock_audio_mixer.h b/api/test/mock_audio_mixer.h
similarity index 100%
rename from webrtc/api/test/mock_audio_mixer.h
rename to api/test/mock_audio_mixer.h
diff --git a/webrtc/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
similarity index 100%
rename from webrtc/api/test/mock_rtpreceiver.h
rename to api/test/mock_rtpreceiver.h
diff --git a/webrtc/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
similarity index 100%
rename from webrtc/api/test/mock_rtpsender.h
rename to api/test/mock_rtpsender.h
diff --git a/webrtc/api/umametrics.h b/api/umametrics.h
similarity index 100%
rename from webrtc/api/umametrics.h
rename to api/umametrics.h
diff --git a/webrtc/api/video/OWNERS b/api/video/OWNERS
similarity index 100%
rename from webrtc/api/video/OWNERS
rename to api/video/OWNERS
diff --git a/webrtc/api/video/i420_buffer.cc b/api/video/i420_buffer.cc
similarity index 100%
rename from webrtc/api/video/i420_buffer.cc
rename to api/video/i420_buffer.cc
diff --git a/webrtc/api/video/i420_buffer.h b/api/video/i420_buffer.h
similarity index 100%
rename from webrtc/api/video/i420_buffer.h
rename to api/video/i420_buffer.h
diff --git a/webrtc/api/video/video_content_type.cc b/api/video/video_content_type.cc
similarity index 100%
rename from webrtc/api/video/video_content_type.cc
rename to api/video/video_content_type.cc
diff --git a/webrtc/api/video/video_content_type.h b/api/video/video_content_type.h
similarity index 100%
rename from webrtc/api/video/video_content_type.h
rename to api/video/video_content_type.h
diff --git a/webrtc/api/video/video_frame.cc b/api/video/video_frame.cc
similarity index 100%
rename from webrtc/api/video/video_frame.cc
rename to api/video/video_frame.cc
diff --git a/webrtc/api/video/video_frame.h b/api/video/video_frame.h
similarity index 100%
rename from webrtc/api/video/video_frame.h
rename to api/video/video_frame.h
diff --git a/webrtc/api/video/video_frame_buffer.cc b/api/video/video_frame_buffer.cc
similarity index 100%
rename from webrtc/api/video/video_frame_buffer.cc
rename to api/video/video_frame_buffer.cc
diff --git a/webrtc/api/video/video_frame_buffer.h b/api/video/video_frame_buffer.h
similarity index 100%
rename from webrtc/api/video/video_frame_buffer.h
rename to api/video/video_frame_buffer.h
diff --git a/webrtc/api/video/video_rotation.h b/api/video/video_rotation.h
similarity index 100%
rename from webrtc/api/video/video_rotation.h
rename to api/video/video_rotation.h
diff --git a/webrtc/api/video/video_timing.cc b/api/video/video_timing.cc
similarity index 100%
rename from webrtc/api/video/video_timing.cc
rename to api/video/video_timing.cc
diff --git a/webrtc/api/video/video_timing.h b/api/video/video_timing.h
similarity index 100%
rename from webrtc/api/video/video_timing.h
rename to api/video/video_timing.h
diff --git a/webrtc/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
similarity index 100%
rename from webrtc/api/video_codecs/BUILD.gn
rename to api/video_codecs/BUILD.gn
diff --git a/webrtc/api/video_codecs/sdp_video_format.h b/api/video_codecs/sdp_video_format.h
similarity index 100%
rename from webrtc/api/video_codecs/sdp_video_format.h
rename to api/video_codecs/sdp_video_format.h
diff --git a/webrtc/api/video_codecs/video_decoder.h b/api/video_codecs/video_decoder.h
similarity index 100%
rename from webrtc/api/video_codecs/video_decoder.h
rename to api/video_codecs/video_decoder.h
diff --git a/webrtc/api/video_codecs/video_decoder_factory.h b/api/video_codecs/video_decoder_factory.h
similarity index 100%
rename from webrtc/api/video_codecs/video_decoder_factory.h
rename to api/video_codecs/video_decoder_factory.h
diff --git a/webrtc/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
similarity index 100%
rename from webrtc/api/video_codecs/video_encoder.cc
rename to api/video_codecs/video_encoder.cc
diff --git a/webrtc/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
similarity index 100%
rename from webrtc/api/video_codecs/video_encoder.h
rename to api/video_codecs/video_encoder.h
diff --git a/webrtc/api/video_codecs/video_encoder_factory.h b/api/video_codecs/video_encoder_factory.h
similarity index 100%
rename from webrtc/api/video_codecs/video_encoder_factory.h
rename to api/video_codecs/video_encoder_factory.h
diff --git a/webrtc/api/videosourceproxy.h b/api/videosourceproxy.h
similarity index 100%
rename from webrtc/api/videosourceproxy.h
rename to api/videosourceproxy.h
diff --git a/webrtc/api/videotracksource.h b/api/videotracksource.h
similarity index 100%
rename from webrtc/api/videotracksource.h
rename to api/videotracksource.h
diff --git a/webrtc/api/webrtcsdp.h b/api/webrtcsdp.h
similarity index 100%
rename from webrtc/api/webrtcsdp.h
rename to api/webrtcsdp.h
diff --git a/webrtc/audio/BUILD.gn b/audio/BUILD.gn
similarity index 100%
rename from webrtc/audio/BUILD.gn
rename to audio/BUILD.gn
diff --git a/webrtc/audio/DEPS b/audio/DEPS
similarity index 100%
rename from webrtc/audio/DEPS
rename to audio/DEPS
diff --git a/webrtc/audio/OWNERS b/audio/OWNERS
similarity index 100%
rename from webrtc/audio/OWNERS
rename to audio/OWNERS
diff --git a/webrtc/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc
similarity index 100%
rename from webrtc/audio/audio_receive_stream.cc
rename to audio/audio_receive_stream.cc
diff --git a/webrtc/audio/audio_receive_stream.h b/audio/audio_receive_stream.h
similarity index 100%
rename from webrtc/audio/audio_receive_stream.h
rename to audio/audio_receive_stream.h
diff --git a/webrtc/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc
similarity index 100%
rename from webrtc/audio/audio_receive_stream_unittest.cc
rename to audio/audio_receive_stream_unittest.cc
diff --git a/webrtc/audio/audio_send_stream.cc b/audio/audio_send_stream.cc
similarity index 100%
rename from webrtc/audio/audio_send_stream.cc
rename to audio/audio_send_stream.cc
diff --git a/webrtc/audio/audio_send_stream.h b/audio/audio_send_stream.h
similarity index 100%
rename from webrtc/audio/audio_send_stream.h
rename to audio/audio_send_stream.h
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc
similarity index 100%
rename from webrtc/audio/audio_send_stream_unittest.cc
rename to audio/audio_send_stream_unittest.cc
diff --git a/webrtc/audio/audio_state.cc b/audio/audio_state.cc
similarity index 100%
rename from webrtc/audio/audio_state.cc
rename to audio/audio_state.cc
diff --git a/webrtc/audio/audio_state.h b/audio/audio_state.h
similarity index 100%
rename from webrtc/audio/audio_state.h
rename to audio/audio_state.h
diff --git a/webrtc/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc
similarity index 100%
rename from webrtc/audio/audio_state_unittest.cc
rename to audio/audio_state_unittest.cc
diff --git a/webrtc/audio/audio_transport_proxy.cc b/audio/audio_transport_proxy.cc
similarity index 100%
rename from webrtc/audio/audio_transport_proxy.cc
rename to audio/audio_transport_proxy.cc
diff --git a/webrtc/audio/audio_transport_proxy.h b/audio/audio_transport_proxy.h
similarity index 100%
rename from webrtc/audio/audio_transport_proxy.h
rename to audio/audio_transport_proxy.h
diff --git a/webrtc/audio/conversion.h b/audio/conversion.h
similarity index 100%
rename from webrtc/audio/conversion.h
rename to audio/conversion.h
diff --git a/webrtc/audio/scoped_voe_interface.h b/audio/scoped_voe_interface.h
similarity index 100%
rename from webrtc/audio/scoped_voe_interface.h
rename to audio/scoped_voe_interface.h
diff --git a/webrtc/audio/test/audio_bwe_integration_test.cc b/audio/test/audio_bwe_integration_test.cc
similarity index 100%
rename from webrtc/audio/test/audio_bwe_integration_test.cc
rename to audio/test/audio_bwe_integration_test.cc
diff --git a/webrtc/audio/test/audio_bwe_integration_test.h b/audio/test/audio_bwe_integration_test.h
similarity index 100%
rename from webrtc/audio/test/audio_bwe_integration_test.h
rename to audio/test/audio_bwe_integration_test.h
diff --git a/webrtc/audio/test/audio_end_to_end_test.cc b/audio/test/audio_end_to_end_test.cc
similarity index 100%
rename from webrtc/audio/test/audio_end_to_end_test.cc
rename to audio/test/audio_end_to_end_test.cc
diff --git a/webrtc/audio/test/audio_end_to_end_test.h b/audio/test/audio_end_to_end_test.h
similarity index 100%
rename from webrtc/audio/test/audio_end_to_end_test.h
rename to audio/test/audio_end_to_end_test.h
diff --git a/webrtc/audio/test/audio_stats_test.cc b/audio/test/audio_stats_test.cc
similarity index 100%
rename from webrtc/audio/test/audio_stats_test.cc
rename to audio/test/audio_stats_test.cc
diff --git a/webrtc/audio/test/low_bandwidth_audio_test.cc b/audio/test/low_bandwidth_audio_test.cc
similarity index 100%
rename from webrtc/audio/test/low_bandwidth_audio_test.cc
rename to audio/test/low_bandwidth_audio_test.cc
diff --git a/webrtc/audio/test/low_bandwidth_audio_test.py b/audio/test/low_bandwidth_audio_test.py
similarity index 100%
rename from webrtc/audio/test/low_bandwidth_audio_test.py
rename to audio/test/low_bandwidth_audio_test.py
diff --git a/webrtc/audio/test/unittests/low_bandwidth_audio_test_test.py b/audio/test/unittests/low_bandwidth_audio_test_test.py
similarity index 100%
rename from webrtc/audio/test/unittests/low_bandwidth_audio_test_test.py
rename to audio/test/unittests/low_bandwidth_audio_test_test.py
diff --git a/webrtc/audio/time_interval.cc b/audio/time_interval.cc
similarity index 100%
rename from webrtc/audio/time_interval.cc
rename to audio/time_interval.cc
diff --git a/webrtc/audio/time_interval.h b/audio/time_interval.h
similarity index 100%
rename from webrtc/audio/time_interval.h
rename to audio/time_interval.h
diff --git a/webrtc/audio/time_interval_unittest.cc b/audio/time_interval_unittest.cc
similarity index 100%
rename from webrtc/audio/time_interval_unittest.cc
rename to audio/time_interval_unittest.cc
diff --git a/webrtc/audio/utility/BUILD.gn b/audio/utility/BUILD.gn
similarity index 100%
rename from webrtc/audio/utility/BUILD.gn
rename to audio/utility/BUILD.gn
diff --git a/webrtc/audio/utility/audio_frame_operations.cc b/audio/utility/audio_frame_operations.cc
similarity index 100%
rename from webrtc/audio/utility/audio_frame_operations.cc
rename to audio/utility/audio_frame_operations.cc
diff --git a/webrtc/audio/utility/audio_frame_operations.h b/audio/utility/audio_frame_operations.h
similarity index 100%
rename from webrtc/audio/utility/audio_frame_operations.h
rename to audio/utility/audio_frame_operations.h
diff --git a/webrtc/audio/utility/audio_frame_operations_unittest.cc b/audio/utility/audio_frame_operations_unittest.cc
similarity index 100%
rename from webrtc/audio/utility/audio_frame_operations_unittest.cc
rename to audio/utility/audio_frame_operations_unittest.cc
diff --git a/webrtc/call/BUILD.gn b/call/BUILD.gn
similarity index 100%
rename from webrtc/call/BUILD.gn
rename to call/BUILD.gn
diff --git a/webrtc/call/DEPS b/call/DEPS
similarity index 100%
rename from webrtc/call/DEPS
rename to call/DEPS
diff --git a/webrtc/call/OWNERS b/call/OWNERS
similarity index 100%
rename from webrtc/call/OWNERS
rename to call/OWNERS
diff --git a/webrtc/call/audio_receive_stream.h b/call/audio_receive_stream.h
similarity index 100%
rename from webrtc/call/audio_receive_stream.h
rename to call/audio_receive_stream.h
diff --git a/webrtc/call/audio_send_stream.cc b/call/audio_send_stream.cc
similarity index 100%
rename from webrtc/call/audio_send_stream.cc
rename to call/audio_send_stream.cc
diff --git a/webrtc/call/audio_send_stream.h b/call/audio_send_stream.h
similarity index 100%
rename from webrtc/call/audio_send_stream.h
rename to call/audio_send_stream.h
diff --git a/webrtc/call/audio_state.h b/call/audio_state.h
similarity index 100%
rename from webrtc/call/audio_state.h
rename to call/audio_state.h
diff --git a/webrtc/call/bitrate_allocator.cc b/call/bitrate_allocator.cc
similarity index 100%
rename from webrtc/call/bitrate_allocator.cc
rename to call/bitrate_allocator.cc
diff --git a/webrtc/call/bitrate_allocator.h b/call/bitrate_allocator.h
similarity index 100%
rename from webrtc/call/bitrate_allocator.h
rename to call/bitrate_allocator.h
diff --git a/webrtc/call/bitrate_allocator_unittest.cc b/call/bitrate_allocator_unittest.cc
similarity index 100%
rename from webrtc/call/bitrate_allocator_unittest.cc
rename to call/bitrate_allocator_unittest.cc
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/call/bitrate_estimator_tests.cc
similarity index 100%
rename from webrtc/call/bitrate_estimator_tests.cc
rename to call/bitrate_estimator_tests.cc
diff --git a/webrtc/call/call.cc b/call/call.cc
similarity index 100%
rename from webrtc/call/call.cc
rename to call/call.cc
diff --git a/webrtc/call/call.h b/call/call.h
similarity index 100%
rename from webrtc/call/call.h
rename to call/call.h
diff --git a/webrtc/call/call_perf_tests.cc b/call/call_perf_tests.cc
similarity index 100%
rename from webrtc/call/call_perf_tests.cc
rename to call/call_perf_tests.cc
diff --git a/webrtc/call/call_unittest.cc b/call/call_unittest.cc
similarity index 100%
rename from webrtc/call/call_unittest.cc
rename to call/call_unittest.cc
diff --git a/webrtc/call/callfactory.cc b/call/callfactory.cc
similarity index 100%
rename from webrtc/call/callfactory.cc
rename to call/callfactory.cc
diff --git a/webrtc/call/callfactory.h b/call/callfactory.h
similarity index 100%
rename from webrtc/call/callfactory.h
rename to call/callfactory.h
diff --git a/webrtc/call/callfactoryinterface.h b/call/callfactoryinterface.h
similarity index 100%
rename from webrtc/call/callfactoryinterface.h
rename to call/callfactoryinterface.h
diff --git a/webrtc/call/fake_rtp_transport_controller_send.h b/call/fake_rtp_transport_controller_send.h
similarity index 100%
rename from webrtc/call/fake_rtp_transport_controller_send.h
rename to call/fake_rtp_transport_controller_send.h
diff --git a/webrtc/call/flexfec_receive_stream.h b/call/flexfec_receive_stream.h
similarity index 100%
rename from webrtc/call/flexfec_receive_stream.h
rename to call/flexfec_receive_stream.h
diff --git a/webrtc/call/flexfec_receive_stream_impl.cc b/call/flexfec_receive_stream_impl.cc
similarity index 100%
rename from webrtc/call/flexfec_receive_stream_impl.cc
rename to call/flexfec_receive_stream_impl.cc
diff --git a/webrtc/call/flexfec_receive_stream_impl.h b/call/flexfec_receive_stream_impl.h
similarity index 100%
rename from webrtc/call/flexfec_receive_stream_impl.h
rename to call/flexfec_receive_stream_impl.h
diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/call/flexfec_receive_stream_unittest.cc
similarity index 100%
rename from webrtc/call/flexfec_receive_stream_unittest.cc
rename to call/flexfec_receive_stream_unittest.cc
diff --git a/webrtc/call/rampup_tests.cc b/call/rampup_tests.cc
similarity index 100%
rename from webrtc/call/rampup_tests.cc
rename to call/rampup_tests.cc
diff --git a/webrtc/call/rampup_tests.h b/call/rampup_tests.h
similarity index 100%
rename from webrtc/call/rampup_tests.h
rename to call/rampup_tests.h
diff --git a/webrtc/call/rtcp_demuxer.cc b/call/rtcp_demuxer.cc
similarity index 100%
rename from webrtc/call/rtcp_demuxer.cc
rename to call/rtcp_demuxer.cc
diff --git a/webrtc/call/rtcp_demuxer.h b/call/rtcp_demuxer.h
similarity index 100%
rename from webrtc/call/rtcp_demuxer.h
rename to call/rtcp_demuxer.h
diff --git a/webrtc/call/rtcp_demuxer_unittest.cc b/call/rtcp_demuxer_unittest.cc
similarity index 100%
rename from webrtc/call/rtcp_demuxer_unittest.cc
rename to call/rtcp_demuxer_unittest.cc
diff --git a/webrtc/call/rtcp_packet_sink_interface.h b/call/rtcp_packet_sink_interface.h
similarity index 100%
rename from webrtc/call/rtcp_packet_sink_interface.h
rename to call/rtcp_packet_sink_interface.h
diff --git a/webrtc/call/rtp_config.cc b/call/rtp_config.cc
similarity index 100%
rename from webrtc/call/rtp_config.cc
rename to call/rtp_config.cc
diff --git a/webrtc/call/rtp_config.h b/call/rtp_config.h
similarity index 100%
rename from webrtc/call/rtp_config.h
rename to call/rtp_config.h
diff --git a/webrtc/call/rtp_demuxer.cc b/call/rtp_demuxer.cc
similarity index 100%
rename from webrtc/call/rtp_demuxer.cc
rename to call/rtp_demuxer.cc
diff --git a/webrtc/call/rtp_demuxer.h b/call/rtp_demuxer.h
similarity index 100%
rename from webrtc/call/rtp_demuxer.h
rename to call/rtp_demuxer.h
diff --git a/webrtc/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc
similarity index 100%
rename from webrtc/call/rtp_demuxer_unittest.cc
rename to call/rtp_demuxer_unittest.cc
diff --git a/webrtc/call/rtp_packet_sink_interface.h b/call/rtp_packet_sink_interface.h
similarity index 100%
rename from webrtc/call/rtp_packet_sink_interface.h
rename to call/rtp_packet_sink_interface.h
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper.cc b/call/rtp_rtcp_demuxer_helper.cc
similarity index 100%
rename from webrtc/call/rtp_rtcp_demuxer_helper.cc
rename to call/rtp_rtcp_demuxer_helper.cc
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper.h b/call/rtp_rtcp_demuxer_helper.h
similarity index 100%
rename from webrtc/call/rtp_rtcp_demuxer_helper.h
rename to call/rtp_rtcp_demuxer_helper.h
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc b/call/rtp_rtcp_demuxer_helper_unittest.cc
similarity index 100%
rename from webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
rename to call/rtp_rtcp_demuxer_helper_unittest.cc
diff --git a/webrtc/call/rtp_stream_receiver_controller.cc b/call/rtp_stream_receiver_controller.cc
similarity index 100%
rename from webrtc/call/rtp_stream_receiver_controller.cc
rename to call/rtp_stream_receiver_controller.cc
diff --git a/webrtc/call/rtp_stream_receiver_controller.h b/call/rtp_stream_receiver_controller.h
similarity index 100%
rename from webrtc/call/rtp_stream_receiver_controller.h
rename to call/rtp_stream_receiver_controller.h
diff --git a/webrtc/call/rtp_stream_receiver_controller_interface.h b/call/rtp_stream_receiver_controller_interface.h
similarity index 100%
rename from webrtc/call/rtp_stream_receiver_controller_interface.h
rename to call/rtp_stream_receiver_controller_interface.h
diff --git a/webrtc/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc
similarity index 100%
rename from webrtc/call/rtp_transport_controller_send.cc
rename to call/rtp_transport_controller_send.cc
diff --git a/webrtc/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h
similarity index 100%
rename from webrtc/call/rtp_transport_controller_send.h
rename to call/rtp_transport_controller_send.h
diff --git a/webrtc/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h
similarity index 100%
rename from webrtc/call/rtp_transport_controller_send_interface.h
rename to call/rtp_transport_controller_send_interface.h
diff --git a/webrtc/call/rtx_receive_stream.cc b/call/rtx_receive_stream.cc
similarity index 100%
rename from webrtc/call/rtx_receive_stream.cc
rename to call/rtx_receive_stream.cc
diff --git a/webrtc/call/rtx_receive_stream.h b/call/rtx_receive_stream.h
similarity index 100%
rename from webrtc/call/rtx_receive_stream.h
rename to call/rtx_receive_stream.h
diff --git a/webrtc/call/rtx_receive_stream_unittest.cc b/call/rtx_receive_stream_unittest.cc
similarity index 100%
rename from webrtc/call/rtx_receive_stream_unittest.cc
rename to call/rtx_receive_stream_unittest.cc
diff --git a/webrtc/call/ssrc_binding_observer.h b/call/ssrc_binding_observer.h
similarity index 100%
rename from webrtc/call/ssrc_binding_observer.h
rename to call/ssrc_binding_observer.h
diff --git a/webrtc/call/syncable.cc b/call/syncable.cc
similarity index 100%
rename from webrtc/call/syncable.cc
rename to call/syncable.cc
diff --git a/webrtc/call/syncable.h b/call/syncable.h
similarity index 100%
rename from webrtc/call/syncable.h
rename to call/syncable.h
diff --git a/webrtc/call/test/mock_rtp_packet_sink_interface.h b/call/test/mock_rtp_packet_sink_interface.h
similarity index 100%
rename from webrtc/call/test/mock_rtp_packet_sink_interface.h
rename to call/test/mock_rtp_packet_sink_interface.h
diff --git a/webrtc/call/video_config.cc b/call/video_config.cc
similarity index 100%
rename from webrtc/call/video_config.cc
rename to call/video_config.cc
diff --git a/webrtc/call/video_config.h b/call/video_config.h
similarity index 100%
rename from webrtc/call/video_config.h
rename to call/video_config.h
diff --git a/webrtc/call/video_receive_stream.cc b/call/video_receive_stream.cc
similarity index 100%
rename from webrtc/call/video_receive_stream.cc
rename to call/video_receive_stream.cc
diff --git a/webrtc/call/video_receive_stream.h b/call/video_receive_stream.h
similarity index 100%
rename from webrtc/call/video_receive_stream.h
rename to call/video_receive_stream.h
diff --git a/webrtc/call/video_send_stream.cc b/call/video_send_stream.cc
similarity index 100%
rename from webrtc/call/video_send_stream.cc
rename to call/video_send_stream.cc
diff --git a/webrtc/call/video_send_stream.h b/call/video_send_stream.h
similarity index 100%
rename from webrtc/call/video_send_stream.h
rename to call/video_send_stream.h
diff --git a/webrtc/common_audio/BUILD.gn b/common_audio/BUILD.gn
similarity index 100%
rename from webrtc/common_audio/BUILD.gn
rename to common_audio/BUILD.gn
diff --git a/webrtc/common_audio/DEPS b/common_audio/DEPS
similarity index 100%
rename from webrtc/common_audio/DEPS
rename to common_audio/DEPS
diff --git a/webrtc/common_audio/OWNERS b/common_audio/OWNERS
similarity index 100%
rename from webrtc/common_audio/OWNERS
rename to common_audio/OWNERS
diff --git a/webrtc/common_audio/audio_converter.cc b/common_audio/audio_converter.cc
similarity index 100%
rename from webrtc/common_audio/audio_converter.cc
rename to common_audio/audio_converter.cc
diff --git a/webrtc/common_audio/audio_converter.h b/common_audio/audio_converter.h
similarity index 100%
rename from webrtc/common_audio/audio_converter.h
rename to common_audio/audio_converter.h
diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/common_audio/audio_converter_unittest.cc
similarity index 100%
rename from webrtc/common_audio/audio_converter_unittest.cc
rename to common_audio/audio_converter_unittest.cc
diff --git a/webrtc/common_audio/audio_ring_buffer.cc b/common_audio/audio_ring_buffer.cc
similarity index 100%
rename from webrtc/common_audio/audio_ring_buffer.cc
rename to common_audio/audio_ring_buffer.cc
diff --git a/webrtc/common_audio/audio_ring_buffer.h b/common_audio/audio_ring_buffer.h
similarity index 100%
rename from webrtc/common_audio/audio_ring_buffer.h
rename to common_audio/audio_ring_buffer.h
diff --git a/webrtc/common_audio/audio_ring_buffer_unittest.cc b/common_audio/audio_ring_buffer_unittest.cc
similarity index 100%
rename from webrtc/common_audio/audio_ring_buffer_unittest.cc
rename to common_audio/audio_ring_buffer_unittest.cc
diff --git a/webrtc/common_audio/audio_util.cc b/common_audio/audio_util.cc
similarity index 100%
rename from webrtc/common_audio/audio_util.cc
rename to common_audio/audio_util.cc
diff --git a/webrtc/common_audio/audio_util_unittest.cc b/common_audio/audio_util_unittest.cc
similarity index 100%
rename from webrtc/common_audio/audio_util_unittest.cc
rename to common_audio/audio_util_unittest.cc
diff --git a/webrtc/common_audio/blocker.cc b/common_audio/blocker.cc
similarity index 100%
rename from webrtc/common_audio/blocker.cc
rename to common_audio/blocker.cc
diff --git a/webrtc/common_audio/blocker.h b/common_audio/blocker.h
similarity index 100%
rename from webrtc/common_audio/blocker.h
rename to common_audio/blocker.h
diff --git a/webrtc/common_audio/blocker_unittest.cc b/common_audio/blocker_unittest.cc
similarity index 100%
rename from webrtc/common_audio/blocker_unittest.cc
rename to common_audio/blocker_unittest.cc
diff --git a/webrtc/common_audio/channel_buffer.cc b/common_audio/channel_buffer.cc
similarity index 100%
rename from webrtc/common_audio/channel_buffer.cc
rename to common_audio/channel_buffer.cc
diff --git a/webrtc/common_audio/channel_buffer.h b/common_audio/channel_buffer.h
similarity index 100%
rename from webrtc/common_audio/channel_buffer.h
rename to common_audio/channel_buffer.h
diff --git a/webrtc/common_audio/channel_buffer_unittest.cc b/common_audio/channel_buffer_unittest.cc
similarity index 100%
rename from webrtc/common_audio/channel_buffer_unittest.cc
rename to common_audio/channel_buffer_unittest.cc
diff --git a/webrtc/common_audio/fft4g.c b/common_audio/fft4g.c
similarity index 100%
rename from webrtc/common_audio/fft4g.c
rename to common_audio/fft4g.c
diff --git a/webrtc/common_audio/fft4g.h b/common_audio/fft4g.h
similarity index 100%
rename from webrtc/common_audio/fft4g.h
rename to common_audio/fft4g.h
diff --git a/webrtc/common_audio/fir_filter.cc b/common_audio/fir_filter.cc
similarity index 100%
rename from webrtc/common_audio/fir_filter.cc
rename to common_audio/fir_filter.cc
diff --git a/webrtc/common_audio/fir_filter.h b/common_audio/fir_filter.h
similarity index 100%
rename from webrtc/common_audio/fir_filter.h
rename to common_audio/fir_filter.h
diff --git a/webrtc/common_audio/fir_filter_neon.cc b/common_audio/fir_filter_neon.cc
similarity index 100%
rename from webrtc/common_audio/fir_filter_neon.cc
rename to common_audio/fir_filter_neon.cc
diff --git a/webrtc/common_audio/fir_filter_neon.h b/common_audio/fir_filter_neon.h
similarity index 100%
rename from webrtc/common_audio/fir_filter_neon.h
rename to common_audio/fir_filter_neon.h
diff --git a/webrtc/common_audio/fir_filter_sse.cc b/common_audio/fir_filter_sse.cc
similarity index 100%
rename from webrtc/common_audio/fir_filter_sse.cc
rename to common_audio/fir_filter_sse.cc
diff --git a/webrtc/common_audio/fir_filter_sse.h b/common_audio/fir_filter_sse.h
similarity index 100%
rename from webrtc/common_audio/fir_filter_sse.h
rename to common_audio/fir_filter_sse.h
diff --git a/webrtc/common_audio/fir_filter_unittest.cc b/common_audio/fir_filter_unittest.cc
similarity index 100%
rename from webrtc/common_audio/fir_filter_unittest.cc
rename to common_audio/fir_filter_unittest.cc
diff --git a/webrtc/common_audio/include/audio_util.h b/common_audio/include/audio_util.h
similarity index 100%
rename from webrtc/common_audio/include/audio_util.h
rename to common_audio/include/audio_util.h
diff --git a/webrtc/common_audio/lapped_transform.cc b/common_audio/lapped_transform.cc
similarity index 100%
rename from webrtc/common_audio/lapped_transform.cc
rename to common_audio/lapped_transform.cc
diff --git a/webrtc/common_audio/lapped_transform.h b/common_audio/lapped_transform.h
similarity index 100%
rename from webrtc/common_audio/lapped_transform.h
rename to common_audio/lapped_transform.h
diff --git a/webrtc/common_audio/lapped_transform_unittest.cc b/common_audio/lapped_transform_unittest.cc
similarity index 100%
rename from webrtc/common_audio/lapped_transform_unittest.cc
rename to common_audio/lapped_transform_unittest.cc
diff --git a/webrtc/common_audio/mocks/mock_smoothing_filter.h b/common_audio/mocks/mock_smoothing_filter.h
similarity index 100%
rename from webrtc/common_audio/mocks/mock_smoothing_filter.h
rename to common_audio/mocks/mock_smoothing_filter.h
diff --git a/webrtc/common_audio/real_fourier.cc b/common_audio/real_fourier.cc
similarity index 100%
rename from webrtc/common_audio/real_fourier.cc
rename to common_audio/real_fourier.cc
diff --git a/webrtc/common_audio/real_fourier.h b/common_audio/real_fourier.h
similarity index 100%
rename from webrtc/common_audio/real_fourier.h
rename to common_audio/real_fourier.h
diff --git a/webrtc/common_audio/real_fourier_ooura.cc b/common_audio/real_fourier_ooura.cc
similarity index 100%
rename from webrtc/common_audio/real_fourier_ooura.cc
rename to common_audio/real_fourier_ooura.cc
diff --git a/webrtc/common_audio/real_fourier_ooura.h b/common_audio/real_fourier_ooura.h
similarity index 100%
rename from webrtc/common_audio/real_fourier_ooura.h
rename to common_audio/real_fourier_ooura.h
diff --git a/webrtc/common_audio/real_fourier_openmax.cc b/common_audio/real_fourier_openmax.cc
similarity index 100%
rename from webrtc/common_audio/real_fourier_openmax.cc
rename to common_audio/real_fourier_openmax.cc
diff --git a/webrtc/common_audio/real_fourier_openmax.h b/common_audio/real_fourier_openmax.h
similarity index 100%
rename from webrtc/common_audio/real_fourier_openmax.h
rename to common_audio/real_fourier_openmax.h
diff --git a/webrtc/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc
similarity index 100%
rename from webrtc/common_audio/real_fourier_unittest.cc
rename to common_audio/real_fourier_unittest.cc
diff --git a/webrtc/common_audio/resampler/include/push_resampler.h b/common_audio/resampler/include/push_resampler.h
similarity index 100%
rename from webrtc/common_audio/resampler/include/push_resampler.h
rename to common_audio/resampler/include/push_resampler.h
diff --git a/webrtc/common_audio/resampler/include/resampler.h b/common_audio/resampler/include/resampler.h
similarity index 100%
rename from webrtc/common_audio/resampler/include/resampler.h
rename to common_audio/resampler/include/resampler.h
diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/common_audio/resampler/push_resampler.cc
similarity index 100%
rename from webrtc/common_audio/resampler/push_resampler.cc
rename to common_audio/resampler/push_resampler.cc
diff --git a/webrtc/common_audio/resampler/push_resampler_unittest.cc b/common_audio/resampler/push_resampler_unittest.cc
similarity index 100%
rename from webrtc/common_audio/resampler/push_resampler_unittest.cc
rename to common_audio/resampler/push_resampler_unittest.cc
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/common_audio/resampler/push_sinc_resampler.cc
similarity index 100%
rename from webrtc/common_audio/resampler/push_sinc_resampler.cc
rename to common_audio/resampler/push_sinc_resampler.cc
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h
similarity index 100%
rename from webrtc/common_audio/resampler/push_sinc_resampler.h
rename to common_audio/resampler/push_sinc_resampler.h
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc
similarity index 100%
rename from webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
rename to common_audio/resampler/push_sinc_resampler_unittest.cc
diff --git a/webrtc/common_audio/resampler/resampler.cc b/common_audio/resampler/resampler.cc
similarity index 100%
rename from webrtc/common_audio/resampler/resampler.cc
rename to common_audio/resampler/resampler.cc
diff --git a/webrtc/common_audio/resampler/resampler_unittest.cc b/common_audio/resampler/resampler_unittest.cc
similarity index 100%
rename from webrtc/common_audio/resampler/resampler_unittest.cc
rename to common_audio/resampler/resampler_unittest.cc
diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/common_audio/resampler/sinc_resampler.cc
similarity index 100%
rename from webrtc/common_audio/resampler/sinc_resampler.cc
rename to common_audio/resampler/sinc_resampler.cc
diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h
similarity index 100%
rename from webrtc/common_audio/resampler/sinc_resampler.h
rename to common_audio/resampler/sinc_resampler.h
diff --git a/webrtc/common_audio/resampler/sinc_resampler_neon.cc b/common_audio/resampler/sinc_resampler_neon.cc
similarity index 100%
rename from webrtc/common_audio/resampler/sinc_resampler_neon.cc
rename to common_audio/resampler/sinc_resampler_neon.cc
diff --git a/webrtc/common_audio/resampler/sinc_resampler_sse.cc b/common_audio/resampler/sinc_resampler_sse.cc
similarity index 100%
rename from webrtc/common_audio/resampler/sinc_resampler_sse.cc
rename to common_audio/resampler/sinc_resampler_sse.cc
diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc
similarity index 100%
rename from webrtc/common_audio/resampler/sinc_resampler_unittest.cc
rename to common_audio/resampler/sinc_resampler_unittest.cc
diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc b/common_audio/resampler/sinusoidal_linear_chirp_source.cc
similarity index 100%
rename from webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc
rename to common_audio/resampler/sinusoidal_linear_chirp_source.cc
diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h b/common_audio/resampler/sinusoidal_linear_chirp_source.h
similarity index 100%
rename from webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
rename to common_audio/resampler/sinusoidal_linear_chirp_source.h
diff --git a/webrtc/common_audio/ring_buffer.c b/common_audio/ring_buffer.c
similarity index 100%
rename from webrtc/common_audio/ring_buffer.c
rename to common_audio/ring_buffer.c
diff --git a/webrtc/common_audio/ring_buffer.h b/common_audio/ring_buffer.h
similarity index 100%
rename from webrtc/common_audio/ring_buffer.h
rename to common_audio/ring_buffer.h
diff --git a/webrtc/common_audio/ring_buffer_unittest.cc b/common_audio/ring_buffer_unittest.cc
similarity index 100%
rename from webrtc/common_audio/ring_buffer_unittest.cc
rename to common_audio/ring_buffer_unittest.cc
diff --git a/webrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c b/common_audio/signal_processing/auto_corr_to_refl_coef.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c
rename to common_audio/signal_processing/auto_corr_to_refl_coef.c
diff --git a/webrtc/common_audio/signal_processing/auto_correlation.c b/common_audio/signal_processing/auto_correlation.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/auto_correlation.c
rename to common_audio/signal_processing/auto_correlation.c
diff --git a/webrtc/common_audio/signal_processing/complex_bit_reverse.c b/common_audio/signal_processing/complex_bit_reverse.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_bit_reverse.c
rename to common_audio/signal_processing/complex_bit_reverse.c
diff --git a/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S b/common_audio/signal_processing/complex_bit_reverse_arm.S
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S
rename to common_audio/signal_processing/complex_bit_reverse_arm.S
diff --git a/webrtc/common_audio/signal_processing/complex_bit_reverse_mips.c b/common_audio/signal_processing/complex_bit_reverse_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_bit_reverse_mips.c
rename to common_audio/signal_processing/complex_bit_reverse_mips.c
diff --git a/webrtc/common_audio/signal_processing/complex_fft.c b/common_audio/signal_processing/complex_fft.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_fft.c
rename to common_audio/signal_processing/complex_fft.c
diff --git a/webrtc/common_audio/signal_processing/complex_fft_mips.c b/common_audio/signal_processing/complex_fft_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_fft_mips.c
rename to common_audio/signal_processing/complex_fft_mips.c
diff --git a/webrtc/common_audio/signal_processing/complex_fft_tables.h b/common_audio/signal_processing/complex_fft_tables.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/complex_fft_tables.h
rename to common_audio/signal_processing/complex_fft_tables.h
diff --git a/webrtc/common_audio/signal_processing/copy_set_operations.c b/common_audio/signal_processing/copy_set_operations.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/copy_set_operations.c
rename to common_audio/signal_processing/copy_set_operations.c
diff --git a/webrtc/common_audio/signal_processing/cross_correlation.c b/common_audio/signal_processing/cross_correlation.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/cross_correlation.c
rename to common_audio/signal_processing/cross_correlation.c
diff --git a/webrtc/common_audio/signal_processing/cross_correlation_mips.c b/common_audio/signal_processing/cross_correlation_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/cross_correlation_mips.c
rename to common_audio/signal_processing/cross_correlation_mips.c
diff --git a/webrtc/common_audio/signal_processing/cross_correlation_neon.c b/common_audio/signal_processing/cross_correlation_neon.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/cross_correlation_neon.c
rename to common_audio/signal_processing/cross_correlation_neon.c
diff --git a/webrtc/common_audio/signal_processing/division_operations.c b/common_audio/signal_processing/division_operations.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/division_operations.c
rename to common_audio/signal_processing/division_operations.c
diff --git a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc b/common_audio/signal_processing/dot_product_with_scale.cc
similarity index 100%
rename from webrtc/common_audio/signal_processing/dot_product_with_scale.cc
rename to common_audio/signal_processing/dot_product_with_scale.cc
diff --git a/webrtc/common_audio/signal_processing/dot_product_with_scale.h b/common_audio/signal_processing/dot_product_with_scale.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/dot_product_with_scale.h
rename to common_audio/signal_processing/dot_product_with_scale.h
diff --git a/webrtc/common_audio/signal_processing/downsample_fast.c b/common_audio/signal_processing/downsample_fast.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/downsample_fast.c
rename to common_audio/signal_processing/downsample_fast.c
diff --git a/webrtc/common_audio/signal_processing/downsample_fast_mips.c b/common_audio/signal_processing/downsample_fast_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/downsample_fast_mips.c
rename to common_audio/signal_processing/downsample_fast_mips.c
diff --git a/webrtc/common_audio/signal_processing/downsample_fast_neon.c b/common_audio/signal_processing/downsample_fast_neon.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/downsample_fast_neon.c
rename to common_audio/signal_processing/downsample_fast_neon.c
diff --git a/webrtc/common_audio/signal_processing/energy.c b/common_audio/signal_processing/energy.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/energy.c
rename to common_audio/signal_processing/energy.c
diff --git a/webrtc/common_audio/signal_processing/filter_ar.c b/common_audio/signal_processing/filter_ar.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/filter_ar.c
rename to common_audio/signal_processing/filter_ar.c
diff --git a/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c b/common_audio/signal_processing/filter_ar_fast_q12.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/filter_ar_fast_q12.c
rename to common_audio/signal_processing/filter_ar_fast_q12.c
diff --git a/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S b/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
similarity index 100%
rename from webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
rename to common_audio/signal_processing/filter_ar_fast_q12_armv7.S
diff --git a/webrtc/common_audio/signal_processing/filter_ar_fast_q12_mips.c b/common_audio/signal_processing/filter_ar_fast_q12_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/filter_ar_fast_q12_mips.c
rename to common_audio/signal_processing/filter_ar_fast_q12_mips.c
diff --git a/webrtc/common_audio/signal_processing/filter_ma_fast_q12.c b/common_audio/signal_processing/filter_ma_fast_q12.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/filter_ma_fast_q12.c
rename to common_audio/signal_processing/filter_ma_fast_q12.c
diff --git a/webrtc/common_audio/signal_processing/get_hanning_window.c b/common_audio/signal_processing/get_hanning_window.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/get_hanning_window.c
rename to common_audio/signal_processing/get_hanning_window.c
diff --git a/webrtc/common_audio/signal_processing/get_scaling_square.c b/common_audio/signal_processing/get_scaling_square.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/get_scaling_square.c
rename to common_audio/signal_processing/get_scaling_square.c
diff --git a/webrtc/common_audio/signal_processing/ilbc_specific_functions.c b/common_audio/signal_processing/ilbc_specific_functions.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/ilbc_specific_functions.c
rename to common_audio/signal_processing/ilbc_specific_functions.c
diff --git a/webrtc/common_audio/signal_processing/include/real_fft.h b/common_audio/signal_processing/include/real_fft.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/include/real_fft.h
rename to common_audio/signal_processing/include/real_fft.h
diff --git a/webrtc/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/include/signal_processing_library.h
rename to common_audio/signal_processing/include/signal_processing_library.h
diff --git a/webrtc/common_audio/signal_processing/include/spl_inl.h b/common_audio/signal_processing/include/spl_inl.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/include/spl_inl.h
rename to common_audio/signal_processing/include/spl_inl.h
diff --git a/webrtc/common_audio/signal_processing/include/spl_inl_armv7.h b/common_audio/signal_processing/include/spl_inl_armv7.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/include/spl_inl_armv7.h
rename to common_audio/signal_processing/include/spl_inl_armv7.h
diff --git a/webrtc/common_audio/signal_processing/include/spl_inl_mips.h b/common_audio/signal_processing/include/spl_inl_mips.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/include/spl_inl_mips.h
rename to common_audio/signal_processing/include/spl_inl_mips.h
diff --git a/webrtc/common_audio/signal_processing/levinson_durbin.c b/common_audio/signal_processing/levinson_durbin.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/levinson_durbin.c
rename to common_audio/signal_processing/levinson_durbin.c
diff --git a/webrtc/common_audio/signal_processing/lpc_to_refl_coef.c b/common_audio/signal_processing/lpc_to_refl_coef.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/lpc_to_refl_coef.c
rename to common_audio/signal_processing/lpc_to_refl_coef.c
diff --git a/webrtc/common_audio/signal_processing/min_max_operations.c b/common_audio/signal_processing/min_max_operations.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/min_max_operations.c
rename to common_audio/signal_processing/min_max_operations.c
diff --git a/webrtc/common_audio/signal_processing/min_max_operations_mips.c b/common_audio/signal_processing/min_max_operations_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/min_max_operations_mips.c
rename to common_audio/signal_processing/min_max_operations_mips.c
diff --git a/webrtc/common_audio/signal_processing/min_max_operations_neon.c b/common_audio/signal_processing/min_max_operations_neon.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/min_max_operations_neon.c
rename to common_audio/signal_processing/min_max_operations_neon.c
diff --git a/webrtc/common_audio/signal_processing/randomization_functions.c b/common_audio/signal_processing/randomization_functions.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/randomization_functions.c
rename to common_audio/signal_processing/randomization_functions.c
diff --git a/webrtc/common_audio/signal_processing/real_fft.c b/common_audio/signal_processing/real_fft.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/real_fft.c
rename to common_audio/signal_processing/real_fft.c
diff --git a/webrtc/common_audio/signal_processing/real_fft_unittest.cc b/common_audio/signal_processing/real_fft_unittest.cc
similarity index 100%
rename from webrtc/common_audio/signal_processing/real_fft_unittest.cc
rename to common_audio/signal_processing/real_fft_unittest.cc
diff --git a/webrtc/common_audio/signal_processing/refl_coef_to_lpc.c b/common_audio/signal_processing/refl_coef_to_lpc.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/refl_coef_to_lpc.c
rename to common_audio/signal_processing/refl_coef_to_lpc.c
diff --git a/webrtc/common_audio/signal_processing/resample.c b/common_audio/signal_processing/resample.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample.c
rename to common_audio/signal_processing/resample.c
diff --git a/webrtc/common_audio/signal_processing/resample_48khz.c b/common_audio/signal_processing/resample_48khz.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_48khz.c
rename to common_audio/signal_processing/resample_48khz.c
diff --git a/webrtc/common_audio/signal_processing/resample_by_2.c b/common_audio/signal_processing/resample_by_2.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_by_2.c
rename to common_audio/signal_processing/resample_by_2.c
diff --git a/webrtc/common_audio/signal_processing/resample_by_2_internal.c b/common_audio/signal_processing/resample_by_2_internal.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_by_2_internal.c
rename to common_audio/signal_processing/resample_by_2_internal.c
diff --git a/webrtc/common_audio/signal_processing/resample_by_2_internal.h b/common_audio/signal_processing/resample_by_2_internal.h
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_by_2_internal.h
rename to common_audio/signal_processing/resample_by_2_internal.h
diff --git a/webrtc/common_audio/signal_processing/resample_by_2_mips.c b/common_audio/signal_processing/resample_by_2_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_by_2_mips.c
rename to common_audio/signal_processing/resample_by_2_mips.c
diff --git a/webrtc/common_audio/signal_processing/resample_fractional.c b/common_audio/signal_processing/resample_fractional.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/resample_fractional.c
rename to common_audio/signal_processing/resample_fractional.c
diff --git a/webrtc/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc
similarity index 100%
rename from webrtc/common_audio/signal_processing/signal_processing_unittest.cc
rename to common_audio/signal_processing/signal_processing_unittest.cc
diff --git a/webrtc/common_audio/signal_processing/spl_init.c b/common_audio/signal_processing/spl_init.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_init.c
rename to common_audio/signal_processing/spl_init.c
diff --git a/webrtc/common_audio/signal_processing/spl_inl.c b/common_audio/signal_processing/spl_inl.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_inl.c
rename to common_audio/signal_processing/spl_inl.c
diff --git a/webrtc/common_audio/signal_processing/spl_sqrt.c b/common_audio/signal_processing/spl_sqrt.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_sqrt.c
rename to common_audio/signal_processing/spl_sqrt.c
diff --git a/webrtc/common_audio/signal_processing/spl_sqrt_floor.c b/common_audio/signal_processing/spl_sqrt_floor.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_sqrt_floor.c
rename to common_audio/signal_processing/spl_sqrt_floor.c
diff --git a/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S b/common_audio/signal_processing/spl_sqrt_floor_arm.S
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S
rename to common_audio/signal_processing/spl_sqrt_floor_arm.S
diff --git a/webrtc/common_audio/signal_processing/spl_sqrt_floor_mips.c b/common_audio/signal_processing/spl_sqrt_floor_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/spl_sqrt_floor_mips.c
rename to common_audio/signal_processing/spl_sqrt_floor_mips.c
diff --git a/webrtc/common_audio/signal_processing/splitting_filter.c b/common_audio/signal_processing/splitting_filter.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/splitting_filter.c
rename to common_audio/signal_processing/splitting_filter.c
diff --git a/webrtc/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c b/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c
rename to common_audio/signal_processing/sqrt_of_one_minus_x_squared.c
diff --git a/webrtc/common_audio/signal_processing/vector_scaling_operations.c b/common_audio/signal_processing/vector_scaling_operations.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/vector_scaling_operations.c
rename to common_audio/signal_processing/vector_scaling_operations.c
diff --git a/webrtc/common_audio/signal_processing/vector_scaling_operations_mips.c b/common_audio/signal_processing/vector_scaling_operations_mips.c
similarity index 100%
rename from webrtc/common_audio/signal_processing/vector_scaling_operations_mips.c
rename to common_audio/signal_processing/vector_scaling_operations_mips.c
diff --git a/webrtc/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc
similarity index 100%
rename from webrtc/common_audio/smoothing_filter.cc
rename to common_audio/smoothing_filter.cc
diff --git a/webrtc/common_audio/smoothing_filter.h b/common_audio/smoothing_filter.h
similarity index 100%
rename from webrtc/common_audio/smoothing_filter.h
rename to common_audio/smoothing_filter.h
diff --git a/webrtc/common_audio/smoothing_filter_unittest.cc b/common_audio/smoothing_filter_unittest.cc
similarity index 100%
rename from webrtc/common_audio/smoothing_filter_unittest.cc
rename to common_audio/smoothing_filter_unittest.cc
diff --git a/webrtc/common_audio/sparse_fir_filter.cc b/common_audio/sparse_fir_filter.cc
similarity index 100%
rename from webrtc/common_audio/sparse_fir_filter.cc
rename to common_audio/sparse_fir_filter.cc
diff --git a/webrtc/common_audio/sparse_fir_filter.h b/common_audio/sparse_fir_filter.h
similarity index 100%
rename from webrtc/common_audio/sparse_fir_filter.h
rename to common_audio/sparse_fir_filter.h
diff --git a/webrtc/common_audio/sparse_fir_filter_unittest.cc b/common_audio/sparse_fir_filter_unittest.cc
similarity index 100%
rename from webrtc/common_audio/sparse_fir_filter_unittest.cc
rename to common_audio/sparse_fir_filter_unittest.cc
diff --git a/webrtc/common_audio/vad/include/vad.h b/common_audio/vad/include/vad.h
similarity index 100%
rename from webrtc/common_audio/vad/include/vad.h
rename to common_audio/vad/include/vad.h
diff --git a/webrtc/common_audio/vad/include/webrtc_vad.h b/common_audio/vad/include/webrtc_vad.h
similarity index 100%
rename from webrtc/common_audio/vad/include/webrtc_vad.h
rename to common_audio/vad/include/webrtc_vad.h
diff --git a/webrtc/common_audio/vad/mock/mock_vad.h b/common_audio/vad/mock/mock_vad.h
similarity index 100%
rename from webrtc/common_audio/vad/mock/mock_vad.h
rename to common_audio/vad/mock/mock_vad.h
diff --git a/webrtc/common_audio/vad/vad.cc b/common_audio/vad/vad.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad.cc
rename to common_audio/vad/vad.cc
diff --git a/webrtc/common_audio/vad/vad_core.c b/common_audio/vad/vad_core.c
similarity index 100%
rename from webrtc/common_audio/vad/vad_core.c
rename to common_audio/vad/vad_core.c
diff --git a/webrtc/common_audio/vad/vad_core.h b/common_audio/vad/vad_core.h
similarity index 100%
rename from webrtc/common_audio/vad/vad_core.h
rename to common_audio/vad/vad_core.h
diff --git a/webrtc/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad_core_unittest.cc
rename to common_audio/vad/vad_core_unittest.cc
diff --git a/webrtc/common_audio/vad/vad_filterbank.c b/common_audio/vad/vad_filterbank.c
similarity index 100%
rename from webrtc/common_audio/vad/vad_filterbank.c
rename to common_audio/vad/vad_filterbank.c
diff --git a/webrtc/common_audio/vad/vad_filterbank.h b/common_audio/vad/vad_filterbank.h
similarity index 100%
rename from webrtc/common_audio/vad/vad_filterbank.h
rename to common_audio/vad/vad_filterbank.h
diff --git a/webrtc/common_audio/vad/vad_filterbank_unittest.cc b/common_audio/vad/vad_filterbank_unittest.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad_filterbank_unittest.cc
rename to common_audio/vad/vad_filterbank_unittest.cc
diff --git a/webrtc/common_audio/vad/vad_gmm.c b/common_audio/vad/vad_gmm.c
similarity index 100%
rename from webrtc/common_audio/vad/vad_gmm.c
rename to common_audio/vad/vad_gmm.c
diff --git a/webrtc/common_audio/vad/vad_gmm.h b/common_audio/vad/vad_gmm.h
similarity index 100%
rename from webrtc/common_audio/vad/vad_gmm.h
rename to common_audio/vad/vad_gmm.h
diff --git a/webrtc/common_audio/vad/vad_gmm_unittest.cc b/common_audio/vad/vad_gmm_unittest.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad_gmm_unittest.cc
rename to common_audio/vad/vad_gmm_unittest.cc
diff --git a/webrtc/common_audio/vad/vad_sp.c b/common_audio/vad/vad_sp.c
similarity index 100%
rename from webrtc/common_audio/vad/vad_sp.c
rename to common_audio/vad/vad_sp.c
diff --git a/webrtc/common_audio/vad/vad_sp.h b/common_audio/vad/vad_sp.h
similarity index 100%
rename from webrtc/common_audio/vad/vad_sp.h
rename to common_audio/vad/vad_sp.h
diff --git a/webrtc/common_audio/vad/vad_sp_unittest.cc b/common_audio/vad/vad_sp_unittest.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad_sp_unittest.cc
rename to common_audio/vad/vad_sp_unittest.cc
diff --git a/webrtc/common_audio/vad/vad_unittest.cc b/common_audio/vad/vad_unittest.cc
similarity index 100%
rename from webrtc/common_audio/vad/vad_unittest.cc
rename to common_audio/vad/vad_unittest.cc
diff --git a/webrtc/common_audio/vad/vad_unittest.h b/common_audio/vad/vad_unittest.h
similarity index 100%
rename from webrtc/common_audio/vad/vad_unittest.h
rename to common_audio/vad/vad_unittest.h
diff --git a/webrtc/common_audio/vad/webrtc_vad.c b/common_audio/vad/webrtc_vad.c
similarity index 100%
rename from webrtc/common_audio/vad/webrtc_vad.c
rename to common_audio/vad/webrtc_vad.c
diff --git a/webrtc/common_audio/wav_file.cc b/common_audio/wav_file.cc
similarity index 100%
rename from webrtc/common_audio/wav_file.cc
rename to common_audio/wav_file.cc
diff --git a/webrtc/common_audio/wav_file.h b/common_audio/wav_file.h
similarity index 100%
rename from webrtc/common_audio/wav_file.h
rename to common_audio/wav_file.h
diff --git a/webrtc/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc
similarity index 100%
rename from webrtc/common_audio/wav_file_unittest.cc
rename to common_audio/wav_file_unittest.cc
diff --git a/webrtc/common_audio/wav_header.cc b/common_audio/wav_header.cc
similarity index 100%
rename from webrtc/common_audio/wav_header.cc
rename to common_audio/wav_header.cc
diff --git a/webrtc/common_audio/wav_header.h b/common_audio/wav_header.h
similarity index 100%
rename from webrtc/common_audio/wav_header.h
rename to common_audio/wav_header.h
diff --git a/webrtc/common_audio/wav_header_unittest.cc b/common_audio/wav_header_unittest.cc
similarity index 100%
rename from webrtc/common_audio/wav_header_unittest.cc
rename to common_audio/wav_header_unittest.cc
diff --git a/webrtc/common_audio/window_generator.cc b/common_audio/window_generator.cc
similarity index 100%
rename from webrtc/common_audio/window_generator.cc
rename to common_audio/window_generator.cc
diff --git a/webrtc/common_audio/window_generator.h b/common_audio/window_generator.h
similarity index 100%
rename from webrtc/common_audio/window_generator.h
rename to common_audio/window_generator.h
diff --git a/webrtc/common_audio/window_generator_unittest.cc b/common_audio/window_generator_unittest.cc
similarity index 100%
rename from webrtc/common_audio/window_generator_unittest.cc
rename to common_audio/window_generator_unittest.cc
diff --git a/webrtc/common_types.cc b/common_types.cc
similarity index 100%
rename from webrtc/common_types.cc
rename to common_types.cc
diff --git a/webrtc/common_types.h b/common_types.h
similarity index 100%
rename from webrtc/common_types.h
rename to common_types.h
diff --git a/webrtc/common_video/BUILD.gn b/common_video/BUILD.gn
similarity index 100%
rename from webrtc/common_video/BUILD.gn
rename to common_video/BUILD.gn
diff --git a/webrtc/common_video/DEPS b/common_video/DEPS
similarity index 100%
rename from webrtc/common_video/DEPS
rename to common_video/DEPS
diff --git a/webrtc/common_video/OWNERS b/common_video/OWNERS
similarity index 100%
rename from webrtc/common_video/OWNERS
rename to common_video/OWNERS
diff --git a/webrtc/common_video/bitrate_adjuster.cc b/common_video/bitrate_adjuster.cc
similarity index 100%
rename from webrtc/common_video/bitrate_adjuster.cc
rename to common_video/bitrate_adjuster.cc
diff --git a/webrtc/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc
similarity index 100%
rename from webrtc/common_video/bitrate_adjuster_unittest.cc
rename to common_video/bitrate_adjuster_unittest.cc
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc
similarity index 100%
rename from webrtc/common_video/h264/h264_bitstream_parser.cc
rename to common_video/h264/h264_bitstream_parser.cc
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.h b/common_video/h264/h264_bitstream_parser.h
similarity index 100%
rename from webrtc/common_video/h264/h264_bitstream_parser.h
rename to common_video/h264/h264_bitstream_parser.h
diff --git a/webrtc/common_video/h264/h264_bitstream_parser_unittest.cc b/common_video/h264/h264_bitstream_parser_unittest.cc
similarity index 100%
rename from webrtc/common_video/h264/h264_bitstream_parser_unittest.cc
rename to common_video/h264/h264_bitstream_parser_unittest.cc
diff --git a/webrtc/common_video/h264/h264_common.cc b/common_video/h264/h264_common.cc
similarity index 100%
rename from webrtc/common_video/h264/h264_common.cc
rename to common_video/h264/h264_common.cc
diff --git a/webrtc/common_video/h264/h264_common.h b/common_video/h264/h264_common.h
similarity index 100%
rename from webrtc/common_video/h264/h264_common.h
rename to common_video/h264/h264_common.h
diff --git a/webrtc/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc
similarity index 100%
rename from webrtc/common_video/h264/pps_parser.cc
rename to common_video/h264/pps_parser.cc
diff --git a/webrtc/common_video/h264/pps_parser.h b/common_video/h264/pps_parser.h
similarity index 100%
rename from webrtc/common_video/h264/pps_parser.h
rename to common_video/h264/pps_parser.h
diff --git a/webrtc/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc
similarity index 100%
rename from webrtc/common_video/h264/pps_parser_unittest.cc
rename to common_video/h264/pps_parser_unittest.cc
diff --git a/webrtc/common_video/h264/profile_level_id.h b/common_video/h264/profile_level_id.h
similarity index 100%
rename from webrtc/common_video/h264/profile_level_id.h
rename to common_video/h264/profile_level_id.h
diff --git a/webrtc/common_video/h264/profile_level_id_unittest.cc b/common_video/h264/profile_level_id_unittest.cc
similarity index 100%
rename from webrtc/common_video/h264/profile_level_id_unittest.cc
rename to common_video/h264/profile_level_id_unittest.cc
diff --git a/webrtc/common_video/h264/sps_parser.cc b/common_video/h264/sps_parser.cc
similarity index 100%
rename from webrtc/common_video/h264/sps_parser.cc
rename to common_video/h264/sps_parser.cc
diff --git a/webrtc/common_video/h264/sps_parser.h b/common_video/h264/sps_parser.h
similarity index 100%
rename from webrtc/common_video/h264/sps_parser.h
rename to common_video/h264/sps_parser.h
diff --git a/webrtc/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc
similarity index 100%
rename from webrtc/common_video/h264/sps_parser_unittest.cc
rename to common_video/h264/sps_parser_unittest.cc
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc
similarity index 100%
rename from webrtc/common_video/h264/sps_vui_rewriter.cc
rename to common_video/h264/sps_vui_rewriter.cc
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.h b/common_video/h264/sps_vui_rewriter.h
similarity index 100%
rename from webrtc/common_video/h264/sps_vui_rewriter.h
rename to common_video/h264/sps_vui_rewriter.h
diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc
similarity index 100%
rename from webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
rename to common_video/h264/sps_vui_rewriter_unittest.cc
diff --git a/webrtc/common_video/i420_buffer_pool.cc b/common_video/i420_buffer_pool.cc
similarity index 100%
rename from webrtc/common_video/i420_buffer_pool.cc
rename to common_video/i420_buffer_pool.cc
diff --git a/webrtc/common_video/i420_buffer_pool_unittest.cc b/common_video/i420_buffer_pool_unittest.cc
similarity index 100%
rename from webrtc/common_video/i420_buffer_pool_unittest.cc
rename to common_video/i420_buffer_pool_unittest.cc
diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/common_video/i420_video_frame_unittest.cc
similarity index 100%
rename from webrtc/common_video/i420_video_frame_unittest.cc
rename to common_video/i420_video_frame_unittest.cc
diff --git a/webrtc/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h
similarity index 100%
rename from webrtc/common_video/include/bitrate_adjuster.h
rename to common_video/include/bitrate_adjuster.h
diff --git a/webrtc/common_video/include/frame_callback.h b/common_video/include/frame_callback.h
similarity index 100%
rename from webrtc/common_video/include/frame_callback.h
rename to common_video/include/frame_callback.h
diff --git a/webrtc/common_video/include/i420_buffer_pool.h b/common_video/include/i420_buffer_pool.h
similarity index 100%
rename from webrtc/common_video/include/i420_buffer_pool.h
rename to common_video/include/i420_buffer_pool.h
diff --git a/webrtc/common_video/include/incoming_video_stream.h b/common_video/include/incoming_video_stream.h
similarity index 100%
rename from webrtc/common_video/include/incoming_video_stream.h
rename to common_video/include/incoming_video_stream.h
diff --git a/webrtc/common_video/include/video_bitrate_allocator.h b/common_video/include/video_bitrate_allocator.h
similarity index 100%
rename from webrtc/common_video/include/video_bitrate_allocator.h
rename to common_video/include/video_bitrate_allocator.h
diff --git a/webrtc/common_video/include/video_frame.h b/common_video/include/video_frame.h
similarity index 100%
rename from webrtc/common_video/include/video_frame.h
rename to common_video/include/video_frame.h
diff --git a/webrtc/common_video/include/video_frame_buffer.h b/common_video/include/video_frame_buffer.h
similarity index 100%
rename from webrtc/common_video/include/video_frame_buffer.h
rename to common_video/include/video_frame_buffer.h
diff --git a/webrtc/common_video/incoming_video_stream.cc b/common_video/incoming_video_stream.cc
similarity index 100%
rename from webrtc/common_video/incoming_video_stream.cc
rename to common_video/incoming_video_stream.cc
diff --git a/webrtc/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h
similarity index 100%
rename from webrtc/common_video/libyuv/include/webrtc_libyuv.h
rename to common_video/libyuv/include/webrtc_libyuv.h
diff --git a/webrtc/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc
similarity index 100%
rename from webrtc/common_video/libyuv/libyuv_unittest.cc
rename to common_video/libyuv/libyuv_unittest.cc
diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc
similarity index 100%
rename from webrtc/common_video/libyuv/webrtc_libyuv.cc
rename to common_video/libyuv/webrtc_libyuv.cc
diff --git a/webrtc/common_video/video_frame.cc b/common_video/video_frame.cc
similarity index 100%
rename from webrtc/common_video/video_frame.cc
rename to common_video/video_frame.cc
diff --git a/webrtc/common_video/video_frame_buffer.cc b/common_video/video_frame_buffer.cc
similarity index 100%
rename from webrtc/common_video/video_frame_buffer.cc
rename to common_video/video_frame_buffer.cc
diff --git a/webrtc/common_video/video_render_frames.cc b/common_video/video_render_frames.cc
similarity index 100%
rename from webrtc/common_video/video_render_frames.cc
rename to common_video/video_render_frames.cc
diff --git a/webrtc/common_video/video_render_frames.h b/common_video/video_render_frames.h
similarity index 100%
rename from webrtc/common_video/video_render_frames.h
rename to common_video/video_render_frames.h
diff --git a/webrtc/examples/BUILD.gn b/examples/BUILD.gn
similarity index 100%
rename from webrtc/examples/BUILD.gn
rename to examples/BUILD.gn
diff --git a/webrtc/examples/DEPS b/examples/DEPS
similarity index 100%
rename from webrtc/examples/DEPS
rename to examples/DEPS
diff --git a/webrtc/examples/OWNERS b/examples/OWNERS
similarity index 100%
rename from webrtc/examples/OWNERS
rename to examples/OWNERS
diff --git a/webrtc/examples/androidapp/AndroidManifest.xml b/examples/androidapp/AndroidManifest.xml
similarity index 100%
rename from webrtc/examples/androidapp/AndroidManifest.xml
rename to examples/androidapp/AndroidManifest.xml
diff --git a/webrtc/examples/androidapp/OWNERS b/examples/androidapp/OWNERS
similarity index 100%
rename from webrtc/examples/androidapp/OWNERS
rename to examples/androidapp/OWNERS
diff --git a/webrtc/examples/androidapp/README b/examples/androidapp/README
similarity index 100%
rename from webrtc/examples/androidapp/README
rename to examples/androidapp/README
diff --git a/webrtc/examples/androidapp/ant.properties b/examples/androidapp/ant.properties
similarity index 100%
rename from webrtc/examples/androidapp/ant.properties
rename to examples/androidapp/ant.properties
diff --git a/webrtc/examples/androidapp/build.xml b/examples/androidapp/build.xml
similarity index 100%
rename from webrtc/examples/androidapp/build.xml
rename to examples/androidapp/build.xml
diff --git a/webrtc/examples/androidapp/project.properties b/examples/androidapp/project.properties
similarity index 100%
rename from webrtc/examples/androidapp/project.properties
rename to examples/androidapp/project.properties
diff --git a/webrtc/examples/androidapp/res/drawable-hdpi/disconnect.png b/examples/androidapp/res/drawable-hdpi/disconnect.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-hdpi/disconnect.png
rename to examples/androidapp/res/drawable-hdpi/disconnect.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-hdpi/ic_action_full_screen.png b/examples/androidapp/res/drawable-hdpi/ic_action_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-hdpi/ic_action_full_screen.png
rename to examples/androidapp/res/drawable-hdpi/ic_action_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png b/examples/androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png
rename to examples/androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-hdpi/ic_launcher.png b/examples/androidapp/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-hdpi/ic_launcher.png
rename to examples/androidapp/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-hdpi/ic_loopback_call.png b/examples/androidapp/res/drawable-hdpi/ic_loopback_call.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-hdpi/ic_loopback_call.png
rename to examples/androidapp/res/drawable-hdpi/ic_loopback_call.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-ldpi/disconnect.png b/examples/androidapp/res/drawable-ldpi/disconnect.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-ldpi/disconnect.png
rename to examples/androidapp/res/drawable-ldpi/disconnect.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-ldpi/ic_action_full_screen.png b/examples/androidapp/res/drawable-ldpi/ic_action_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-ldpi/ic_action_full_screen.png
rename to examples/androidapp/res/drawable-ldpi/ic_action_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png b/examples/androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png
rename to examples/androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-ldpi/ic_launcher.png b/examples/androidapp/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-ldpi/ic_launcher.png
rename to examples/androidapp/res/drawable-ldpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-ldpi/ic_loopback_call.png b/examples/androidapp/res/drawable-ldpi/ic_loopback_call.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-ldpi/ic_loopback_call.png
rename to examples/androidapp/res/drawable-ldpi/ic_loopback_call.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-mdpi/disconnect.png b/examples/androidapp/res/drawable-mdpi/disconnect.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-mdpi/disconnect.png
rename to examples/androidapp/res/drawable-mdpi/disconnect.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-mdpi/ic_action_full_screen.png b/examples/androidapp/res/drawable-mdpi/ic_action_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-mdpi/ic_action_full_screen.png
rename to examples/androidapp/res/drawable-mdpi/ic_action_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png b/examples/androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png
rename to examples/androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-mdpi/ic_launcher.png b/examples/androidapp/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-mdpi/ic_launcher.png
rename to examples/androidapp/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-mdpi/ic_loopback_call.png b/examples/androidapp/res/drawable-mdpi/ic_loopback_call.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-mdpi/ic_loopback_call.png
rename to examples/androidapp/res/drawable-mdpi/ic_loopback_call.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-xhdpi/disconnect.png b/examples/androidapp/res/drawable-xhdpi/disconnect.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-xhdpi/disconnect.png
rename to examples/androidapp/res/drawable-xhdpi/disconnect.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_full_screen.png b/examples/androidapp/res/drawable-xhdpi/ic_action_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_full_screen.png
rename to examples/androidapp/res/drawable-xhdpi/ic_action_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png b/examples/androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png
rename to examples/androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-xhdpi/ic_launcher.png b/examples/androidapp/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-xhdpi/ic_launcher.png
rename to examples/androidapp/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/drawable-xhdpi/ic_loopback_call.png b/examples/androidapp/res/drawable-xhdpi/ic_loopback_call.png
similarity index 100%
rename from webrtc/examples/androidapp/res/drawable-xhdpi/ic_loopback_call.png
rename to examples/androidapp/res/drawable-xhdpi/ic_loopback_call.png
Binary files differ
diff --git a/webrtc/examples/androidapp/res/layout/activity_call.xml b/examples/androidapp/res/layout/activity_call.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/layout/activity_call.xml
rename to examples/androidapp/res/layout/activity_call.xml
diff --git a/webrtc/examples/androidapp/res/layout/activity_connect.xml b/examples/androidapp/res/layout/activity_connect.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/layout/activity_connect.xml
rename to examples/androidapp/res/layout/activity_connect.xml
diff --git a/webrtc/examples/androidapp/res/layout/fragment_call.xml b/examples/androidapp/res/layout/fragment_call.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/layout/fragment_call.xml
rename to examples/androidapp/res/layout/fragment_call.xml
diff --git a/webrtc/examples/androidapp/res/layout/fragment_hud.xml b/examples/androidapp/res/layout/fragment_hud.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/layout/fragment_hud.xml
rename to examples/androidapp/res/layout/fragment_hud.xml
diff --git a/webrtc/examples/androidapp/res/menu/connect_menu.xml b/examples/androidapp/res/menu/connect_menu.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/menu/connect_menu.xml
rename to examples/androidapp/res/menu/connect_menu.xml
diff --git a/webrtc/examples/androidapp/res/values-v17/styles.xml b/examples/androidapp/res/values-v17/styles.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/values-v17/styles.xml
rename to examples/androidapp/res/values-v17/styles.xml
diff --git a/webrtc/examples/androidapp/res/values-v21/styles.xml b/examples/androidapp/res/values-v21/styles.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/values-v21/styles.xml
rename to examples/androidapp/res/values-v21/styles.xml
diff --git a/webrtc/examples/androidapp/res/values/arrays.xml b/examples/androidapp/res/values/arrays.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/values/arrays.xml
rename to examples/androidapp/res/values/arrays.xml
diff --git a/webrtc/examples/androidapp/res/values/strings.xml b/examples/androidapp/res/values/strings.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/values/strings.xml
rename to examples/androidapp/res/values/strings.xml
diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/examples/androidapp/res/xml/preferences.xml
similarity index 100%
rename from webrtc/examples/androidapp/res/xml/preferences.xml
rename to examples/androidapp/res/xml/preferences.xml
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
rename to examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
rename to examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java
rename to examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
rename to examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
rename to examples/androidapp/src/org/appspot/apprtc/CallActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallFragment.java b/examples/androidapp/src/org/appspot/apprtc/CallFragment.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/CallFragment.java
rename to examples/androidapp/src/org/appspot/apprtc/CallFragment.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java b/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
rename to examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
rename to examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java b/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
rename to examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java b/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
rename to examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java b/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java
rename to examples/androidapp/src/org/appspot/apprtc/HudFragment.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
rename to examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java b/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java
rename to examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java b/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
rename to examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsFragment.java b/examples/androidapp/src/org/appspot/apprtc/SettingsFragment.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsFragment.java
rename to examples/androidapp/src/org/appspot/apprtc/SettingsFragment.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java b/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
rename to examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java b/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
rename to examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java b/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
rename to examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java b/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
rename to examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java b/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
rename to examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java b/examples/androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java
similarity index 100%
rename from webrtc/examples/androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java
rename to examples/androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java
diff --git a/webrtc/examples/androidapp/start_loopback_stubbed_camera_saved_video_out.py b/examples/androidapp/start_loopback_stubbed_camera_saved_video_out.py
similarity index 100%
rename from webrtc/examples/androidapp/start_loopback_stubbed_camera_saved_video_out.py
rename to examples/androidapp/start_loopback_stubbed_camera_saved_video_out.py
diff --git a/webrtc/examples/androidapp/third_party/autobanh/BUILD.gn b/examples/androidapp/third_party/autobanh/BUILD.gn
similarity index 100%
rename from webrtc/examples/androidapp/third_party/autobanh/BUILD.gn
rename to examples/androidapp/third_party/autobanh/BUILD.gn
diff --git a/webrtc/examples/androidapp/third_party/autobanh/LICENSE b/examples/androidapp/third_party/autobanh/LICENSE
similarity index 100%
rename from webrtc/examples/androidapp/third_party/autobanh/LICENSE
rename to examples/androidapp/third_party/autobanh/LICENSE
diff --git a/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md b/examples/androidapp/third_party/autobanh/LICENSE.md
similarity index 100%
rename from webrtc/examples/androidapp/third_party/autobanh/LICENSE.md
rename to examples/androidapp/third_party/autobanh/LICENSE.md
diff --git a/webrtc/examples/androidapp/third_party/autobanh/NOTICE b/examples/androidapp/third_party/autobanh/NOTICE
similarity index 100%
rename from webrtc/examples/androidapp/third_party/autobanh/NOTICE
rename to examples/androidapp/third_party/autobanh/NOTICE
diff --git a/webrtc/examples/androidapp/third_party/autobanh/lib/autobanh.jar b/examples/androidapp/third_party/autobanh/lib/autobanh.jar
similarity index 100%
rename from webrtc/examples/androidapp/third_party/autobanh/lib/autobanh.jar
rename to examples/androidapp/third_party/autobanh/lib/autobanh.jar
Binary files differ
diff --git a/webrtc/examples/androidjunit/README b/examples/androidjunit/README
similarity index 100%
rename from webrtc/examples/androidjunit/README
rename to examples/androidjunit/README
diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
similarity index 100%
rename from webrtc/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
rename to examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
similarity index 100%
rename from webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
rename to examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java b/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
similarity index 100%
rename from webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
rename to examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
diff --git a/webrtc/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml
similarity index 100%
rename from webrtc/examples/androidtests/AndroidManifest.xml
rename to examples/androidtests/AndroidManifest.xml
diff --git a/webrtc/examples/androidtests/OWNERS b/examples/androidtests/OWNERS
similarity index 100%
rename from webrtc/examples/androidtests/OWNERS
rename to examples/androidtests/OWNERS
diff --git a/webrtc/examples/androidtests/README b/examples/androidtests/README
similarity index 100%
rename from webrtc/examples/androidtests/README
rename to examples/androidtests/README
diff --git a/webrtc/examples/androidtests/ant.properties b/examples/androidtests/ant.properties
similarity index 100%
rename from webrtc/examples/androidtests/ant.properties
rename to examples/androidtests/ant.properties
diff --git a/webrtc/examples/androidtests/build.xml b/examples/androidtests/build.xml
similarity index 100%
rename from webrtc/examples/androidtests/build.xml
rename to examples/androidtests/build.xml
diff --git a/webrtc/examples/androidtests/gradle_project_test.py b/examples/androidtests/gradle_project_test.py
similarity index 100%
rename from webrtc/examples/androidtests/gradle_project_test.py
rename to examples/androidtests/gradle_project_test.py
diff --git a/webrtc/examples/androidtests/project.properties b/examples/androidtests/project.properties
similarity index 100%
rename from webrtc/examples/androidtests/project.properties
rename to examples/androidtests/project.properties
diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java b/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
similarity index 100%
rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
rename to examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
similarity index 100%
rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
rename to examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
diff --git a/webrtc/examples/androidtests/third_party/.gitignore b/examples/androidtests/third_party/.gitignore
similarity index 100%
rename from webrtc/examples/androidtests/third_party/.gitignore
rename to examples/androidtests/third_party/.gitignore
diff --git a/webrtc/examples/androidtests/third_party/README.webrtc b/examples/androidtests/third_party/README.webrtc
similarity index 100%
rename from webrtc/examples/androidtests/third_party/README.webrtc
rename to examples/androidtests/third_party/README.webrtc
diff --git a/webrtc/examples/androidtests/video_quality_loopback_test.py b/examples/androidtests/video_quality_loopback_test.py
similarity index 100%
rename from webrtc/examples/androidtests/video_quality_loopback_test.py
rename to examples/androidtests/video_quality_loopback_test.py
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDAppClient+Internal.h b/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
rename to examples/objc/AppRTCMobile/ARDAppClient+Internal.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDAppClient.h b/examples/objc/AppRTCMobile/ARDAppClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDAppClient.h
rename to examples/objc/AppRTCMobile/ARDAppClient.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDAppClient.m b/examples/objc/AppRTCMobile/ARDAppClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDAppClient.m
rename to examples/objc/AppRTCMobile/ARDAppClient.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.h b/examples/objc/AppRTCMobile/ARDAppEngineClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.h
rename to examples/objc/AppRTCMobile/ARDAppEngineClient.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.m b/examples/objc/AppRTCMobile/ARDAppEngineClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.m
rename to examples/objc/AppRTCMobile/ARDAppEngineClient.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.h b/examples/objc/AppRTCMobile/ARDBitrateTracker.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.h
rename to examples/objc/AppRTCMobile/ARDBitrateTracker.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.m b/examples/objc/AppRTCMobile/ARDBitrateTracker.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.m
rename to examples/objc/AppRTCMobile/ARDBitrateTracker.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDCaptureController.h b/examples/objc/AppRTCMobile/ARDCaptureController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDCaptureController.h
rename to examples/objc/AppRTCMobile/ARDCaptureController.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDCaptureController.m b/examples/objc/AppRTCMobile/ARDCaptureController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDCaptureController.m
rename to examples/objc/AppRTCMobile/ARDCaptureController.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h b/examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h
rename to examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.h b/examples/objc/AppRTCMobile/ARDJoinResponse.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.h
rename to examples/objc/AppRTCMobile/ARDJoinResponse.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.m b/examples/objc/AppRTCMobile/ARDJoinResponse.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.m
rename to examples/objc/AppRTCMobile/ARDJoinResponse.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h b/examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h
rename to examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.h b/examples/objc/AppRTCMobile/ARDMessageResponse.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.h
rename to examples/objc/AppRTCMobile/ARDMessageResponse.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.m b/examples/objc/AppRTCMobile/ARDMessageResponse.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.m
rename to examples/objc/AppRTCMobile/ARDMessageResponse.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDRoomServerClient.h b/examples/objc/AppRTCMobile/ARDRoomServerClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDRoomServerClient.h
rename to examples/objc/AppRTCMobile/ARDRoomServerClient.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.h b/examples/objc/AppRTCMobile/ARDSDPUtils.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.h
rename to examples/objc/AppRTCMobile/ARDSDPUtils.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m b/examples/objc/AppRTCMobile/ARDSDPUtils.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m
rename to examples/objc/AppRTCMobile/ARDSDPUtils.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel+Private.h b/examples/objc/AppRTCMobile/ARDSettingsModel+Private.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSettingsModel+Private.h
rename to examples/objc/AppRTCMobile/ARDSettingsModel+Private.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.h b/examples/objc/AppRTCMobile/ARDSettingsModel.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.h
rename to examples/objc/AppRTCMobile/ARDSettingsModel.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m b/examples/objc/AppRTCMobile/ARDSettingsModel.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSettingsModel.m
rename to examples/objc/AppRTCMobile/ARDSettingsModel.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsStore.h b/examples/objc/AppRTCMobile/ARDSettingsStore.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSettingsStore.h
rename to examples/objc/AppRTCMobile/ARDSettingsStore.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSettingsStore.m b/examples/objc/AppRTCMobile/ARDSettingsStore.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSettingsStore.m
rename to examples/objc/AppRTCMobile/ARDSettingsStore.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSignalingChannel.h b/examples/objc/AppRTCMobile/ARDSignalingChannel.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSignalingChannel.h
rename to examples/objc/AppRTCMobile/ARDSignalingChannel.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.h b/examples/objc/AppRTCMobile/ARDSignalingMessage.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.h
rename to examples/objc/AppRTCMobile/ARDSignalingMessage.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.m b/examples/objc/AppRTCMobile/ARDSignalingMessage.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.m
rename to examples/objc/AppRTCMobile/ARDSignalingMessage.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.h b/examples/objc/AppRTCMobile/ARDStatsBuilder.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.h
rename to examples/objc/AppRTCMobile/ARDStatsBuilder.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.m b/examples/objc/AppRTCMobile/ARDStatsBuilder.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.m
rename to examples/objc/AppRTCMobile/ARDStatsBuilder.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDTURNClient+Internal.h b/examples/objc/AppRTCMobile/ARDTURNClient+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDTURNClient+Internal.h
rename to examples/objc/AppRTCMobile/ARDTURNClient+Internal.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDTURNClient.h b/examples/objc/AppRTCMobile/ARDTURNClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDTURNClient.h
rename to examples/objc/AppRTCMobile/ARDTURNClient.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDTURNClient.m b/examples/objc/AppRTCMobile/ARDTURNClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDTURNClient.m
rename to examples/objc/AppRTCMobile/ARDTURNClient.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.h b/examples/objc/AppRTCMobile/ARDWebSocketChannel.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.h
rename to examples/objc/AppRTCMobile/ARDWebSocketChannel.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.m b/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
rename to examples/objc/AppRTCMobile/ARDWebSocketChannel.m
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
rename to examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m b/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
rename to examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h b/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
rename to examples/objc/AppRTCMobile/RTCIceServer+JSON.h
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.m b/examples/objc/AppRTCMobile/RTCIceServer+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.m
rename to examples/objc/AppRTCMobile/RTCIceServer+JSON.m
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h b/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h
rename to examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m b/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m
rename to examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h b/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
rename to examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
diff --git a/webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m b/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m
rename to examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m
diff --git a/webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.h b/examples/objc/AppRTCMobile/common/ARDUtilities.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.h
rename to examples/objc/AppRTCMobile/common/ARDUtilities.h
diff --git a/webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.m b/examples/objc/AppRTCMobile/common/ARDUtilities.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.m
rename to examples/objc/AppRTCMobile/common/ARDUtilities.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h b/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
rename to examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m b/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
rename to examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.h b/examples/objc/AppRTCMobile/ios/ARDMainView.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.h
rename to examples/objc/AppRTCMobile/ios/ARDMainView.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.m b/examples/objc/AppRTCMobile/ios/ARDMainView.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.m
rename to examples/objc/AppRTCMobile/ios/ARDMainView.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.h b/examples/objc/AppRTCMobile/ios/ARDMainViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.h
rename to examples/objc/AppRTCMobile/ios/ARDMainViewController.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m b/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
rename to examples/objc/AppRTCMobile/ios/ARDMainViewController.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h b/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h
rename to examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m b/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m
rename to examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.h b/examples/objc/AppRTCMobile/ios/ARDStatsView.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.h
rename to examples/objc/AppRTCMobile/ios/ARDStatsView.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.m b/examples/objc/AppRTCMobile/ios/ARDStatsView.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.m
rename to examples/objc/AppRTCMobile/ios/ARDStatsView.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
rename to examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
rename to examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h b/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h
rename to examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m b/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
rename to examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch b/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
rename to examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/Info.plist b/examples/objc/AppRTCMobile/ios/Info.plist
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/Info.plist
rename to examples/objc/AppRTCMobile/ios/Info.plist
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h b/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h
rename to examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m b/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m
rename to examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/main.m b/examples/objc/AppRTCMobile/ios/main.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/main.m
rename to examples/objc/AppRTCMobile/ios/main.m
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf b/examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf
rename to examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png b/examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png b/examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png b/examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png
rename to examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png b/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png b/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png b/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png b/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp.png b/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp@2x.png b/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_settings_black_24dp@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png b/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png b/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png b/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png b/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png
rename to examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 b/examples/objc/AppRTCMobile/ios/resources/mozart.mp3
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3
rename to examples/objc/AppRTCMobile/ios/resources/mozart.mp3
Binary files differ
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h b/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h
rename to examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m b/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
rename to examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.h b/examples/objc/AppRTCMobile/mac/APPRTCViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.h
rename to examples/objc/AppRTCMobile/mac/APPRTCViewController.h
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.m b/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
rename to examples/objc/AppRTCMobile/mac/APPRTCViewController.m
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/Info.plist b/examples/objc/AppRTCMobile/mac/Info.plist
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/Info.plist
rename to examples/objc/AppRTCMobile/mac/Info.plist
diff --git a/webrtc/examples/objc/AppRTCMobile/mac/main.m b/examples/objc/AppRTCMobile/mac/main.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/mac/main.m
rename to examples/objc/AppRTCMobile/mac/main.m
diff --git a/webrtc/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
rename to examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
diff --git a/webrtc/examples/objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm
rename to examples/objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm
diff --git a/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
rename to examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
diff --git a/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE b/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE
rename to examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE
diff --git a/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h
rename to examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h
diff --git a/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
rename to examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
diff --git a/webrtc/examples/objc/Icon-120.png b/examples/objc/Icon-120.png
similarity index 100%
rename from webrtc/examples/objc/Icon-120.png
rename to examples/objc/Icon-120.png
Binary files differ
diff --git a/webrtc/examples/objc/Icon-180.png b/examples/objc/Icon-180.png
similarity index 100%
rename from webrtc/examples/objc/Icon-180.png
rename to examples/objc/Icon-180.png
Binary files differ
diff --git a/webrtc/examples/objc/Icon.png b/examples/objc/Icon.png
similarity index 100%
rename from webrtc/examples/objc/Icon.png
rename to examples/objc/Icon.png
Binary files differ
diff --git a/webrtc/examples/objc/README b/examples/objc/README
similarity index 100%
rename from webrtc/examples/objc/README
rename to examples/objc/README
diff --git a/webrtc/examples/peerconnection/OWNERS b/examples/peerconnection/OWNERS
similarity index 100%
rename from webrtc/examples/peerconnection/OWNERS
rename to examples/peerconnection/OWNERS
diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/conductor.cc
rename to examples/peerconnection/client/conductor.cc
diff --git a/webrtc/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/conductor.h
rename to examples/peerconnection/client/conductor.h
diff --git a/webrtc/examples/peerconnection/client/defaults.cc b/examples/peerconnection/client/defaults.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/defaults.cc
rename to examples/peerconnection/client/defaults.cc
diff --git a/webrtc/examples/peerconnection/client/defaults.h b/examples/peerconnection/client/defaults.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/defaults.h
rename to examples/peerconnection/client/defaults.h
diff --git a/webrtc/examples/peerconnection/client/flagdefs.h b/examples/peerconnection/client/flagdefs.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/flagdefs.h
rename to examples/peerconnection/client/flagdefs.h
diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/linux/main.cc
rename to examples/peerconnection/client/linux/main.cc
diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/examples/peerconnection/client/linux/main_wnd.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/linux/main_wnd.cc
rename to examples/peerconnection/client/linux/main_wnd.cc
diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.h b/examples/peerconnection/client/linux/main_wnd.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/linux/main_wnd.h
rename to examples/peerconnection/client/linux/main_wnd.h
diff --git a/webrtc/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/main.cc
rename to examples/peerconnection/client/main.cc
diff --git a/webrtc/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/main_wnd.cc
rename to examples/peerconnection/client/main_wnd.cc
diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/main_wnd.h
rename to examples/peerconnection/client/main_wnd.h
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc
similarity index 100%
rename from webrtc/examples/peerconnection/client/peer_connection_client.cc
rename to examples/peerconnection/client/peer_connection_client.cc
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h
similarity index 100%
rename from webrtc/examples/peerconnection/client/peer_connection_client.h
rename to examples/peerconnection/client/peer_connection_client.h
diff --git a/webrtc/examples/peerconnection/server/data_socket.cc b/examples/peerconnection/server/data_socket.cc
similarity index 100%
rename from webrtc/examples/peerconnection/server/data_socket.cc
rename to examples/peerconnection/server/data_socket.cc
diff --git a/webrtc/examples/peerconnection/server/data_socket.h b/examples/peerconnection/server/data_socket.h
similarity index 100%
rename from webrtc/examples/peerconnection/server/data_socket.h
rename to examples/peerconnection/server/data_socket.h
diff --git a/webrtc/examples/peerconnection/server/main.cc b/examples/peerconnection/server/main.cc
similarity index 100%
rename from webrtc/examples/peerconnection/server/main.cc
rename to examples/peerconnection/server/main.cc
diff --git a/webrtc/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc
similarity index 100%
rename from webrtc/examples/peerconnection/server/peer_channel.cc
rename to examples/peerconnection/server/peer_channel.cc
diff --git a/webrtc/examples/peerconnection/server/peer_channel.h b/examples/peerconnection/server/peer_channel.h
similarity index 100%
rename from webrtc/examples/peerconnection/server/peer_channel.h
rename to examples/peerconnection/server/peer_channel.h
diff --git a/webrtc/examples/peerconnection/server/server_test.html b/examples/peerconnection/server/server_test.html
similarity index 100%
rename from webrtc/examples/peerconnection/server/server_test.html
rename to examples/peerconnection/server/server_test.html
diff --git a/webrtc/examples/peerconnection/server/utils.cc b/examples/peerconnection/server/utils.cc
similarity index 100%
rename from webrtc/examples/peerconnection/server/utils.cc
rename to examples/peerconnection/server/utils.cc
diff --git a/webrtc/examples/peerconnection/server/utils.h b/examples/peerconnection/server/utils.h
similarity index 100%
rename from webrtc/examples/peerconnection/server/utils.h
rename to examples/peerconnection/server/utils.h
diff --git a/webrtc/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc
similarity index 100%
rename from webrtc/examples/relayserver/relayserver_main.cc
rename to examples/relayserver/relayserver_main.cc
diff --git a/webrtc/examples/stunprober/main.cc b/examples/stunprober/main.cc
similarity index 100%
rename from webrtc/examples/stunprober/main.cc
rename to examples/stunprober/main.cc
diff --git a/webrtc/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc
similarity index 100%
rename from webrtc/examples/stunserver/stunserver_main.cc
rename to examples/stunserver/stunserver_main.cc
diff --git a/webrtc/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc
similarity index 100%
rename from webrtc/examples/turnserver/turnserver_main.cc
rename to examples/turnserver/turnserver_main.cc
diff --git a/webrtc/examples/unityplugin/ANDROID_INSTRUCTION b/examples/unityplugin/ANDROID_INSTRUCTION
similarity index 100%
rename from webrtc/examples/unityplugin/ANDROID_INSTRUCTION
rename to examples/unityplugin/ANDROID_INSTRUCTION
diff --git a/webrtc/examples/unityplugin/DEPS b/examples/unityplugin/DEPS
similarity index 100%
rename from webrtc/examples/unityplugin/DEPS
rename to examples/unityplugin/DEPS
diff --git a/webrtc/examples/unityplugin/OWNERS b/examples/unityplugin/OWNERS
similarity index 100%
rename from webrtc/examples/unityplugin/OWNERS
rename to examples/unityplugin/OWNERS
diff --git a/webrtc/examples/unityplugin/README b/examples/unityplugin/README
similarity index 100%
rename from webrtc/examples/unityplugin/README
rename to examples/unityplugin/README
diff --git a/webrtc/examples/unityplugin/classreferenceholder.cc b/examples/unityplugin/classreferenceholder.cc
similarity index 100%
rename from webrtc/examples/unityplugin/classreferenceholder.cc
rename to examples/unityplugin/classreferenceholder.cc
diff --git a/webrtc/examples/unityplugin/classreferenceholder.h b/examples/unityplugin/classreferenceholder.h
similarity index 100%
rename from webrtc/examples/unityplugin/classreferenceholder.h
rename to examples/unityplugin/classreferenceholder.h
diff --git a/webrtc/examples/unityplugin/java/src/org/webrtc/UnityUtility.java b/examples/unityplugin/java/src/org/webrtc/UnityUtility.java
similarity index 100%
rename from webrtc/examples/unityplugin/java/src/org/webrtc/UnityUtility.java
rename to examples/unityplugin/java/src/org/webrtc/UnityUtility.java
diff --git a/webrtc/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc
similarity index 100%
rename from webrtc/examples/unityplugin/jni_onload.cc
rename to examples/unityplugin/jni_onload.cc
diff --git a/webrtc/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc
similarity index 100%
rename from webrtc/examples/unityplugin/simple_peer_connection.cc
rename to examples/unityplugin/simple_peer_connection.cc
diff --git a/webrtc/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h
similarity index 100%
rename from webrtc/examples/unityplugin/simple_peer_connection.h
rename to examples/unityplugin/simple_peer_connection.h
diff --git a/webrtc/examples/unityplugin/unity_plugin_apis.cc b/examples/unityplugin/unity_plugin_apis.cc
similarity index 100%
rename from webrtc/examples/unityplugin/unity_plugin_apis.cc
rename to examples/unityplugin/unity_plugin_apis.cc
diff --git a/webrtc/examples/unityplugin/unity_plugin_apis.h b/examples/unityplugin/unity_plugin_apis.h
similarity index 100%
rename from webrtc/examples/unityplugin/unity_plugin_apis.h
rename to examples/unityplugin/unity_plugin_apis.h
diff --git a/webrtc/examples/unityplugin/video_observer.cc b/examples/unityplugin/video_observer.cc
similarity index 100%
rename from webrtc/examples/unityplugin/video_observer.cc
rename to examples/unityplugin/video_observer.cc
diff --git a/webrtc/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h
similarity index 100%
rename from webrtc/examples/unityplugin/video_observer.h
rename to examples/unityplugin/video_observer.h
diff --git a/webrtc/logging/BUILD.gn b/logging/BUILD.gn
similarity index 100%
rename from webrtc/logging/BUILD.gn
rename to logging/BUILD.gn
diff --git a/webrtc/logging/OWNERS b/logging/OWNERS
similarity index 100%
rename from webrtc/logging/OWNERS
rename to logging/OWNERS
diff --git a/webrtc/logging/rtc_event_log/DEPS b/logging/rtc_event_log/DEPS
similarity index 100%
rename from webrtc/logging/rtc_event_log/DEPS
rename to logging/rtc_event_log/DEPS
diff --git a/webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h
rename to logging/rtc_event_log/mock/mock_rtc_event_log.h
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/logging/rtc_event_log/rtc_event_log.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log.cc
rename to logging/rtc_event_log/rtc_event_log.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log.h
rename to logging/rtc_event_log/rtc_event_log.h
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.proto b/logging/rtc_event_log/rtc_event_log.proto
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log.proto
rename to logging/rtc_event_log/rtc_event_log.proto
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
rename to logging/rtc_event_log/rtc_event_log2rtp_dump.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc b/logging/rtc_event_log/rtc_event_log2stats.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
rename to logging/rtc_event_log/rtc_event_log2stats.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc b/logging/rtc_event_log/rtc_event_log2text.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log2text.cc
rename to logging/rtc_event_log/rtc_event_log2text.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_factory.cc b/logging/rtc_event_log/rtc_event_log_factory.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_factory.cc
rename to logging/rtc_event_log/rtc_event_log_factory.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_factory.h b/logging/rtc_event_log/rtc_event_log_factory.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_factory.h
rename to logging/rtc_event_log/rtc_event_log_factory.h
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h b/logging/rtc_event_log/rtc_event_log_factory_interface.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h
rename to logging/rtc_event_log/rtc_event_log_factory_interface.h
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
rename to logging/rtc_event_log/rtc_event_log_parser.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_parser.h
rename to logging/rtc_event_log/rtc_event_log_parser.h
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
rename to logging/rtc_event_log/rtc_event_log_unittest.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
rename to logging/rtc_event_log/rtc_event_log_unittest_helper.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h b/logging/rtc_event_log/rtc_event_log_unittest_helper.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h
rename to logging/rtc_event_log/rtc_event_log_unittest_helper.h
diff --git a/webrtc/logging/rtc_event_log/rtc_stream_config.cc b/logging/rtc_event_log/rtc_stream_config.cc
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_stream_config.cc
rename to logging/rtc_event_log/rtc_stream_config.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_stream_config.h b/logging/rtc_event_log/rtc_stream_config.h
similarity index 100%
rename from webrtc/logging/rtc_event_log/rtc_stream_config.h
rename to logging/rtc_event_log/rtc_stream_config.h
diff --git a/webrtc/media/BUILD.gn b/media/BUILD.gn
similarity index 100%
rename from webrtc/media/BUILD.gn
rename to media/BUILD.gn
diff --git a/webrtc/media/DEPS b/media/DEPS
similarity index 100%
rename from webrtc/media/DEPS
rename to media/DEPS
diff --git a/webrtc/media/OWNERS b/media/OWNERS
similarity index 100%
rename from webrtc/media/OWNERS
rename to media/OWNERS
diff --git a/webrtc/media/base/adaptedvideotracksource.cc b/media/base/adaptedvideotracksource.cc
similarity index 100%
rename from webrtc/media/base/adaptedvideotracksource.cc
rename to media/base/adaptedvideotracksource.cc
diff --git a/webrtc/media/base/adaptedvideotracksource.h b/media/base/adaptedvideotracksource.h
similarity index 100%
rename from webrtc/media/base/adaptedvideotracksource.h
rename to media/base/adaptedvideotracksource.h
diff --git a/webrtc/media/base/audiosource.h b/media/base/audiosource.h
similarity index 100%
rename from webrtc/media/base/audiosource.h
rename to media/base/audiosource.h
diff --git a/webrtc/media/base/codec.cc b/media/base/codec.cc
similarity index 100%
rename from webrtc/media/base/codec.cc
rename to media/base/codec.cc
diff --git a/webrtc/media/base/codec.h b/media/base/codec.h
similarity index 100%
rename from webrtc/media/base/codec.h
rename to media/base/codec.h
diff --git a/webrtc/media/base/codec_unittest.cc b/media/base/codec_unittest.cc
similarity index 100%
rename from webrtc/media/base/codec_unittest.cc
rename to media/base/codec_unittest.cc
diff --git a/webrtc/media/base/cryptoparams.h b/media/base/cryptoparams.h
similarity index 100%
rename from webrtc/media/base/cryptoparams.h
rename to media/base/cryptoparams.h
diff --git a/webrtc/media/base/device.h b/media/base/device.h
similarity index 100%
rename from webrtc/media/base/device.h
rename to media/base/device.h
diff --git a/webrtc/media/base/fakemediaengine.h b/media/base/fakemediaengine.h
similarity index 100%
rename from webrtc/media/base/fakemediaengine.h
rename to media/base/fakemediaengine.h
diff --git a/webrtc/media/base/fakenetworkinterface.h b/media/base/fakenetworkinterface.h
similarity index 100%
rename from webrtc/media/base/fakenetworkinterface.h
rename to media/base/fakenetworkinterface.h
diff --git a/webrtc/media/base/fakertp.cc b/media/base/fakertp.cc
similarity index 100%
rename from webrtc/media/base/fakertp.cc
rename to media/base/fakertp.cc
diff --git a/webrtc/media/base/fakertp.h b/media/base/fakertp.h
similarity index 100%
rename from webrtc/media/base/fakertp.h
rename to media/base/fakertp.h
diff --git a/webrtc/media/base/fakevideocapturer.h b/media/base/fakevideocapturer.h
similarity index 100%
rename from webrtc/media/base/fakevideocapturer.h
rename to media/base/fakevideocapturer.h
diff --git a/webrtc/media/base/fakevideorenderer.h b/media/base/fakevideorenderer.h
similarity index 100%
rename from webrtc/media/base/fakevideorenderer.h
rename to media/base/fakevideorenderer.h
diff --git a/webrtc/media/base/h264_profile_level_id.cc b/media/base/h264_profile_level_id.cc
similarity index 100%
rename from webrtc/media/base/h264_profile_level_id.cc
rename to media/base/h264_profile_level_id.cc
diff --git a/webrtc/media/base/h264_profile_level_id.h b/media/base/h264_profile_level_id.h
similarity index 100%
rename from webrtc/media/base/h264_profile_level_id.h
rename to media/base/h264_profile_level_id.h
diff --git a/webrtc/media/base/mediachannel.h b/media/base/mediachannel.h
similarity index 100%
rename from webrtc/media/base/mediachannel.h
rename to media/base/mediachannel.h
diff --git a/webrtc/media/base/mediaconstants.cc b/media/base/mediaconstants.cc
similarity index 100%
rename from webrtc/media/base/mediaconstants.cc
rename to media/base/mediaconstants.cc
diff --git a/webrtc/media/base/mediaconstants.h b/media/base/mediaconstants.h
similarity index 100%
rename from webrtc/media/base/mediaconstants.h
rename to media/base/mediaconstants.h
diff --git a/webrtc/media/base/mediaengine.cc b/media/base/mediaengine.cc
similarity index 100%
rename from webrtc/media/base/mediaengine.cc
rename to media/base/mediaengine.cc
diff --git a/webrtc/media/base/mediaengine.h b/media/base/mediaengine.h
similarity index 100%
rename from webrtc/media/base/mediaengine.h
rename to media/base/mediaengine.h
diff --git a/webrtc/media/base/rtpdataengine.cc b/media/base/rtpdataengine.cc
similarity index 100%
rename from webrtc/media/base/rtpdataengine.cc
rename to media/base/rtpdataengine.cc
diff --git a/webrtc/media/base/rtpdataengine.h b/media/base/rtpdataengine.h
similarity index 100%
rename from webrtc/media/base/rtpdataengine.h
rename to media/base/rtpdataengine.h
diff --git a/webrtc/media/base/rtpdataengine_unittest.cc b/media/base/rtpdataengine_unittest.cc
similarity index 100%
rename from webrtc/media/base/rtpdataengine_unittest.cc
rename to media/base/rtpdataengine_unittest.cc
diff --git a/webrtc/media/base/rtputils.cc b/media/base/rtputils.cc
similarity index 100%
rename from webrtc/media/base/rtputils.cc
rename to media/base/rtputils.cc
diff --git a/webrtc/media/base/rtputils.h b/media/base/rtputils.h
similarity index 100%
rename from webrtc/media/base/rtputils.h
rename to media/base/rtputils.h
diff --git a/webrtc/media/base/rtputils_unittest.cc b/media/base/rtputils_unittest.cc
similarity index 100%
rename from webrtc/media/base/rtputils_unittest.cc
rename to media/base/rtputils_unittest.cc
diff --git a/webrtc/media/base/streamparams.cc b/media/base/streamparams.cc
similarity index 100%
rename from webrtc/media/base/streamparams.cc
rename to media/base/streamparams.cc
diff --git a/webrtc/media/base/streamparams.h b/media/base/streamparams.h
similarity index 100%
rename from webrtc/media/base/streamparams.h
rename to media/base/streamparams.h
diff --git a/webrtc/media/base/streamparams_unittest.cc b/media/base/streamparams_unittest.cc
similarity index 100%
rename from webrtc/media/base/streamparams_unittest.cc
rename to media/base/streamparams_unittest.cc
diff --git a/webrtc/media/base/test/mock_mediachannel.h b/media/base/test/mock_mediachannel.h
similarity index 100%
rename from webrtc/media/base/test/mock_mediachannel.h
rename to media/base/test/mock_mediachannel.h
diff --git a/webrtc/media/base/testutils.cc b/media/base/testutils.cc
similarity index 100%
rename from webrtc/media/base/testutils.cc
rename to media/base/testutils.cc
diff --git a/webrtc/media/base/testutils.h b/media/base/testutils.h
similarity index 100%
rename from webrtc/media/base/testutils.h
rename to media/base/testutils.h
diff --git a/webrtc/media/base/turnutils.cc b/media/base/turnutils.cc
similarity index 100%
rename from webrtc/media/base/turnutils.cc
rename to media/base/turnutils.cc
diff --git a/webrtc/media/base/turnutils.h b/media/base/turnutils.h
similarity index 100%
rename from webrtc/media/base/turnutils.h
rename to media/base/turnutils.h
diff --git a/webrtc/media/base/turnutils_unittest.cc b/media/base/turnutils_unittest.cc
similarity index 100%
rename from webrtc/media/base/turnutils_unittest.cc
rename to media/base/turnutils_unittest.cc
diff --git a/webrtc/media/base/videoadapter.cc b/media/base/videoadapter.cc
similarity index 100%
rename from webrtc/media/base/videoadapter.cc
rename to media/base/videoadapter.cc
diff --git a/webrtc/media/base/videoadapter.h b/media/base/videoadapter.h
similarity index 100%
rename from webrtc/media/base/videoadapter.h
rename to media/base/videoadapter.h
diff --git a/webrtc/media/base/videoadapter_unittest.cc b/media/base/videoadapter_unittest.cc
similarity index 100%
rename from webrtc/media/base/videoadapter_unittest.cc
rename to media/base/videoadapter_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster.cc b/media/base/videobroadcaster.cc
similarity index 100%
rename from webrtc/media/base/videobroadcaster.cc
rename to media/base/videobroadcaster.cc
diff --git a/webrtc/media/base/videobroadcaster.h b/media/base/videobroadcaster.h
similarity index 100%
rename from webrtc/media/base/videobroadcaster.h
rename to media/base/videobroadcaster.h
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/media/base/videobroadcaster_unittest.cc
similarity index 100%
rename from webrtc/media/base/videobroadcaster_unittest.cc
rename to media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videocapturer.cc b/media/base/videocapturer.cc
similarity index 100%
rename from webrtc/media/base/videocapturer.cc
rename to media/base/videocapturer.cc
diff --git a/webrtc/media/base/videocapturer.h b/media/base/videocapturer.h
similarity index 100%
rename from webrtc/media/base/videocapturer.h
rename to media/base/videocapturer.h
diff --git a/webrtc/media/base/videocapturer_unittest.cc b/media/base/videocapturer_unittest.cc
similarity index 100%
rename from webrtc/media/base/videocapturer_unittest.cc
rename to media/base/videocapturer_unittest.cc
diff --git a/webrtc/media/base/videocapturerfactory.h b/media/base/videocapturerfactory.h
similarity index 100%
rename from webrtc/media/base/videocapturerfactory.h
rename to media/base/videocapturerfactory.h
diff --git a/webrtc/media/base/videocommon.cc b/media/base/videocommon.cc
similarity index 100%
rename from webrtc/media/base/videocommon.cc
rename to media/base/videocommon.cc
diff --git a/webrtc/media/base/videocommon.h b/media/base/videocommon.h
similarity index 100%
rename from webrtc/media/base/videocommon.h
rename to media/base/videocommon.h
diff --git a/webrtc/media/base/videocommon_unittest.cc b/media/base/videocommon_unittest.cc
similarity index 100%
rename from webrtc/media/base/videocommon_unittest.cc
rename to media/base/videocommon_unittest.cc
diff --git a/webrtc/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h
similarity index 100%
rename from webrtc/media/base/videoengine_unittest.h
rename to media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videosinkinterface.h b/media/base/videosinkinterface.h
similarity index 100%
rename from webrtc/media/base/videosinkinterface.h
rename to media/base/videosinkinterface.h
diff --git a/webrtc/media/base/videosourcebase.cc b/media/base/videosourcebase.cc
similarity index 100%
rename from webrtc/media/base/videosourcebase.cc
rename to media/base/videosourcebase.cc
diff --git a/webrtc/media/base/videosourcebase.h b/media/base/videosourcebase.h
similarity index 100%
rename from webrtc/media/base/videosourcebase.h
rename to media/base/videosourcebase.h
diff --git a/webrtc/media/base/videosourceinterface.cc b/media/base/videosourceinterface.cc
similarity index 100%
rename from webrtc/media/base/videosourceinterface.cc
rename to media/base/videosourceinterface.cc
diff --git a/webrtc/media/base/videosourceinterface.h b/media/base/videosourceinterface.h
similarity index 100%
rename from webrtc/media/base/videosourceinterface.h
rename to media/base/videosourceinterface.h
diff --git a/webrtc/media/engine/adm_helpers.cc b/media/engine/adm_helpers.cc
similarity index 100%
rename from webrtc/media/engine/adm_helpers.cc
rename to media/engine/adm_helpers.cc
diff --git a/webrtc/media/engine/adm_helpers.h b/media/engine/adm_helpers.h
similarity index 100%
rename from webrtc/media/engine/adm_helpers.h
rename to media/engine/adm_helpers.h
diff --git a/webrtc/media/engine/apm_helpers.cc b/media/engine/apm_helpers.cc
similarity index 100%
rename from webrtc/media/engine/apm_helpers.cc
rename to media/engine/apm_helpers.cc
diff --git a/webrtc/media/engine/apm_helpers.h b/media/engine/apm_helpers.h
similarity index 100%
rename from webrtc/media/engine/apm_helpers.h
rename to media/engine/apm_helpers.h
diff --git a/webrtc/media/engine/apm_helpers_unittest.cc b/media/engine/apm_helpers_unittest.cc
similarity index 100%
rename from webrtc/media/engine/apm_helpers_unittest.cc
rename to media/engine/apm_helpers_unittest.cc
diff --git a/webrtc/media/engine/constants.h b/media/engine/constants.h
similarity index 100%
rename from webrtc/media/engine/constants.h
rename to media/engine/constants.h
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/media/engine/fakewebrtccall.cc
similarity index 100%
rename from webrtc/media/engine/fakewebrtccall.cc
rename to media/engine/fakewebrtccall.cc
diff --git a/webrtc/media/engine/fakewebrtccall.h b/media/engine/fakewebrtccall.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtccall.h
rename to media/engine/fakewebrtccall.h
diff --git a/webrtc/media/engine/fakewebrtcdeviceinfo.h b/media/engine/fakewebrtcdeviceinfo.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtcdeviceinfo.h
rename to media/engine/fakewebrtcdeviceinfo.h
diff --git a/webrtc/media/engine/fakewebrtcvcmfactory.h b/media/engine/fakewebrtcvcmfactory.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtcvcmfactory.h
rename to media/engine/fakewebrtcvcmfactory.h
diff --git a/webrtc/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtcvideocapturemodule.h
rename to media/engine/fakewebrtcvideocapturemodule.h
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/media/engine/fakewebrtcvideoengine.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtcvideoengine.h
rename to media/engine/fakewebrtcvideoengine.h
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/media/engine/fakewebrtcvoiceengine.h
similarity index 100%
rename from webrtc/media/engine/fakewebrtcvoiceengine.h
rename to media/engine/fakewebrtcvoiceengine.h
diff --git a/webrtc/media/engine/internaldecoderfactory.cc b/media/engine/internaldecoderfactory.cc
similarity index 100%
rename from webrtc/media/engine/internaldecoderfactory.cc
rename to media/engine/internaldecoderfactory.cc
diff --git a/webrtc/media/engine/internaldecoderfactory.h b/media/engine/internaldecoderfactory.h
similarity index 100%
rename from webrtc/media/engine/internaldecoderfactory.h
rename to media/engine/internaldecoderfactory.h
diff --git a/webrtc/media/engine/internaldecoderfactory_unittest.cc b/media/engine/internaldecoderfactory_unittest.cc
similarity index 100%
rename from webrtc/media/engine/internaldecoderfactory_unittest.cc
rename to media/engine/internaldecoderfactory_unittest.cc
diff --git a/webrtc/media/engine/internalencoderfactory.cc b/media/engine/internalencoderfactory.cc
similarity index 100%
rename from webrtc/media/engine/internalencoderfactory.cc
rename to media/engine/internalencoderfactory.cc
diff --git a/webrtc/media/engine/internalencoderfactory.h b/media/engine/internalencoderfactory.h
similarity index 100%
rename from webrtc/media/engine/internalencoderfactory.h
rename to media/engine/internalencoderfactory.h
diff --git a/webrtc/media/engine/nullwebrtcvideoengine.h b/media/engine/nullwebrtcvideoengine.h
similarity index 100%
rename from webrtc/media/engine/nullwebrtcvideoengine.h
rename to media/engine/nullwebrtcvideoengine.h
diff --git a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc b/media/engine/nullwebrtcvideoengine_unittest.cc
similarity index 100%
rename from webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
rename to media/engine/nullwebrtcvideoengine_unittest.cc
diff --git a/webrtc/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
similarity index 100%
rename from webrtc/media/engine/payload_type_mapper.cc
rename to media/engine/payload_type_mapper.cc
diff --git a/webrtc/media/engine/payload_type_mapper.h b/media/engine/payload_type_mapper.h
similarity index 100%
rename from webrtc/media/engine/payload_type_mapper.h
rename to media/engine/payload_type_mapper.h
diff --git a/webrtc/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
similarity index 100%
rename from webrtc/media/engine/payload_type_mapper_unittest.cc
rename to media/engine/payload_type_mapper_unittest.cc
diff --git a/webrtc/media/engine/scopedvideodecoder.cc b/media/engine/scopedvideodecoder.cc
similarity index 100%
rename from webrtc/media/engine/scopedvideodecoder.cc
rename to media/engine/scopedvideodecoder.cc
diff --git a/webrtc/media/engine/scopedvideodecoder.h b/media/engine/scopedvideodecoder.h
similarity index 100%
rename from webrtc/media/engine/scopedvideodecoder.h
rename to media/engine/scopedvideodecoder.h
diff --git a/webrtc/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc
similarity index 100%
rename from webrtc/media/engine/scopedvideoencoder.cc
rename to media/engine/scopedvideoencoder.cc
diff --git a/webrtc/media/engine/scopedvideoencoder.h b/media/engine/scopedvideoencoder.h
similarity index 100%
rename from webrtc/media/engine/scopedvideoencoder.h
rename to media/engine/scopedvideoencoder.h
diff --git a/webrtc/media/engine/simulcast.cc b/media/engine/simulcast.cc
similarity index 100%
rename from webrtc/media/engine/simulcast.cc
rename to media/engine/simulcast.cc
diff --git a/webrtc/media/engine/simulcast.h b/media/engine/simulcast.h
similarity index 100%
rename from webrtc/media/engine/simulcast.h
rename to media/engine/simulcast.h
diff --git a/webrtc/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
similarity index 100%
rename from webrtc/media/engine/simulcast_encoder_adapter.cc
rename to media/engine/simulcast_encoder_adapter.cc
diff --git a/webrtc/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h
similarity index 100%
rename from webrtc/media/engine/simulcast_encoder_adapter.h
rename to media/engine/simulcast_encoder_adapter.h
diff --git a/webrtc/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
similarity index 100%
rename from webrtc/media/engine/simulcast_encoder_adapter_unittest.cc
rename to media/engine/simulcast_encoder_adapter_unittest.cc
diff --git a/webrtc/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
similarity index 100%
rename from webrtc/media/engine/simulcast_unittest.cc
rename to media/engine/simulcast_unittest.cc
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc b/media/engine/videodecodersoftwarefallbackwrapper.cc
similarity index 100%
rename from webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
rename to media/engine/videodecodersoftwarefallbackwrapper.cc
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.h b/media/engine/videodecodersoftwarefallbackwrapper.h
similarity index 100%
rename from webrtc/media/engine/videodecodersoftwarefallbackwrapper.h
rename to media/engine/videodecodersoftwarefallbackwrapper.h
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
similarity index 100%
rename from webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
rename to media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/media/engine/videoencodersoftwarefallbackwrapper.cc
similarity index 100%
rename from webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
rename to media/engine/videoencodersoftwarefallbackwrapper.cc
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.h b/media/engine/videoencodersoftwarefallbackwrapper.h
similarity index 100%
rename from webrtc/media/engine/videoencodersoftwarefallbackwrapper.h
rename to media/engine/videoencodersoftwarefallbackwrapper.h
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
similarity index 100%
rename from webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
rename to media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
diff --git a/webrtc/media/engine/webrtccommon.h b/media/engine/webrtccommon.h
similarity index 100%
rename from webrtc/media/engine/webrtccommon.h
rename to media/engine/webrtccommon.h
diff --git a/webrtc/media/engine/webrtcmediaengine.cc b/media/engine/webrtcmediaengine.cc
similarity index 100%
rename from webrtc/media/engine/webrtcmediaengine.cc
rename to media/engine/webrtcmediaengine.cc
diff --git a/webrtc/media/engine/webrtcmediaengine.h b/media/engine/webrtcmediaengine.h
similarity index 100%
rename from webrtc/media/engine/webrtcmediaengine.h
rename to media/engine/webrtcmediaengine.h
diff --git a/webrtc/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc
similarity index 100%
rename from webrtc/media/engine/webrtcmediaengine_unittest.cc
rename to media/engine/webrtcmediaengine_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/media/engine/webrtcvideocapturer.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideocapturer.cc
rename to media/engine/webrtcvideocapturer.cc
diff --git a/webrtc/media/engine/webrtcvideocapturer.h b/media/engine/webrtcvideocapturer.h
similarity index 100%
rename from webrtc/media/engine/webrtcvideocapturer.h
rename to media/engine/webrtcvideocapturer.h
diff --git a/webrtc/media/engine/webrtcvideocapturer_unittest.cc b/media/engine/webrtcvideocapturer_unittest.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideocapturer_unittest.cc
rename to media/engine/webrtcvideocapturer_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideocapturerfactory.cc b/media/engine/webrtcvideocapturerfactory.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideocapturerfactory.cc
rename to media/engine/webrtcvideocapturerfactory.cc
diff --git a/webrtc/media/engine/webrtcvideocapturerfactory.h b/media/engine/webrtcvideocapturerfactory.h
similarity index 100%
rename from webrtc/media/engine/webrtcvideocapturerfactory.h
rename to media/engine/webrtcvideocapturerfactory.h
diff --git a/webrtc/media/engine/webrtcvideodecoderfactory.h b/media/engine/webrtcvideodecoderfactory.h
similarity index 100%
rename from webrtc/media/engine/webrtcvideodecoderfactory.h
rename to media/engine/webrtcvideodecoderfactory.h
diff --git a/webrtc/media/engine/webrtcvideoencoderfactory.h b/media/engine/webrtcvideoencoderfactory.h
similarity index 100%
rename from webrtc/media/engine/webrtcvideoencoderfactory.h
rename to media/engine/webrtcvideoencoderfactory.h
diff --git a/webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc b/media/engine/webrtcvideoencoderfactory_unittest.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc
rename to media/engine/webrtcvideoencoderfactory_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideoengine.cc
rename to media/engine/webrtcvideoengine.cc
diff --git a/webrtc/media/engine/webrtcvideoengine.h b/media/engine/webrtcvideoengine.h
similarity index 100%
rename from webrtc/media/engine/webrtcvideoengine.h
rename to media/engine/webrtcvideoengine.h
diff --git a/webrtc/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvideoengine_unittest.cc
rename to media/engine/webrtcvideoengine_unittest.cc
diff --git a/webrtc/media/engine/webrtcvoe.h b/media/engine/webrtcvoe.h
similarity index 100%
rename from webrtc/media/engine/webrtcvoe.h
rename to media/engine/webrtcvoe.h
diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvoiceengine.cc
rename to media/engine/webrtcvoiceengine.cc
diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h
similarity index 100%
rename from webrtc/media/engine/webrtcvoiceengine.h
rename to media/engine/webrtcvoiceengine.h
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/media/engine/webrtcvoiceengine_unittest.cc
similarity index 100%
rename from webrtc/media/engine/webrtcvoiceengine_unittest.cc
rename to media/engine/webrtcvoiceengine_unittest.cc
diff --git a/webrtc/media/sctp/sctptransport.cc b/media/sctp/sctptransport.cc
similarity index 100%
rename from webrtc/media/sctp/sctptransport.cc
rename to media/sctp/sctptransport.cc
diff --git a/webrtc/media/sctp/sctptransport.h b/media/sctp/sctptransport.h
similarity index 100%
rename from webrtc/media/sctp/sctptransport.h
rename to media/sctp/sctptransport.h
diff --git a/webrtc/media/sctp/sctptransport_unittest.cc b/media/sctp/sctptransport_unittest.cc
similarity index 100%
rename from webrtc/media/sctp/sctptransport_unittest.cc
rename to media/sctp/sctptransport_unittest.cc
diff --git a/webrtc/media/sctp/sctptransportinternal.h b/media/sctp/sctptransportinternal.h
similarity index 100%
rename from webrtc/media/sctp/sctptransportinternal.h
rename to media/sctp/sctptransportinternal.h
diff --git a/webrtc/modules/BUILD.gn b/modules/BUILD.gn
similarity index 100%
rename from webrtc/modules/BUILD.gn
rename to modules/BUILD.gn
diff --git a/webrtc/modules/OWNERS b/modules/OWNERS
similarity index 100%
rename from webrtc/modules/OWNERS
rename to modules/OWNERS
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_coding/BUILD.gn
rename to modules/audio_coding/BUILD.gn
diff --git a/webrtc/modules/audio_coding/DEPS b/modules/audio_coding/DEPS
similarity index 100%
rename from webrtc/modules/audio_coding/DEPS
rename to modules/audio_coding/DEPS
diff --git a/webrtc/modules/audio_coding/OWNERS b/modules/audio_coding/OWNERS
similarity index 100%
rename from webrtc/modules/audio_coding/OWNERS
rename to modules/audio_coding/OWNERS
diff --git a/webrtc/modules/audio_coding/acm2/acm_codec_database.cc b/modules/audio_coding/acm2/acm_codec_database.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_codec_database.cc
rename to modules/audio_coding/acm2/acm_codec_database.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_codec_database.h b/modules/audio_coding/acm2/acm_codec_database.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_codec_database.h
rename to modules/audio_coding/acm2/acm_codec_database.h
diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test.cc b/modules/audio_coding/acm2/acm_receive_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receive_test.cc
rename to modules/audio_coding/acm2/acm_receive_test.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test.h b/modules/audio_coding/acm2/acm_receive_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receive_test.h
rename to modules/audio_coding/acm2/acm_receive_test.h
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receiver.cc
rename to modules/audio_coding/acm2/acm_receiver.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receiver.h
rename to modules/audio_coding/acm2/acm_receiver.h
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc
rename to modules/audio_coding/acm2/acm_receiver_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_resampler.cc b/modules/audio_coding/acm2/acm_resampler.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_resampler.cc
rename to modules/audio_coding/acm2/acm_resampler.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_resampler.h b/modules/audio_coding/acm2/acm_resampler.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_resampler.h
rename to modules/audio_coding/acm2/acm_resampler.h
diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test.cc b/modules/audio_coding/acm2/acm_send_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_send_test.cc
rename to modules/audio_coding/acm2/acm_send_test.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test.h b/modules/audio_coding/acm2/acm_send_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_send_test.h
rename to modules/audio_coding/acm2/acm_send_test.h
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/audio_coding_module.cc
rename to modules/audio_coding/acm2/audio_coding_module.cc
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc
rename to modules/audio_coding/acm2/audio_coding_module_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/call_statistics.cc b/modules/audio_coding/acm2/call_statistics.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/call_statistics.cc
rename to modules/audio_coding/acm2/call_statistics.cc
diff --git a/webrtc/modules/audio_coding/acm2/call_statistics.h b/modules/audio_coding/acm2/call_statistics.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/call_statistics.h
rename to modules/audio_coding/acm2/call_statistics.h
diff --git a/webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc b/modules/audio_coding/acm2/call_statistics_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc
rename to modules/audio_coding/acm2/call_statistics_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.cc b/modules/audio_coding/acm2/codec_manager.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/codec_manager.cc
rename to modules/audio_coding/acm2/codec_manager.cc
diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.h b/modules/audio_coding/acm2/codec_manager.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/codec_manager.h
rename to modules/audio_coding/acm2/codec_manager.h
diff --git a/webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc b/modules/audio_coding/acm2/codec_manager_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc
rename to modules/audio_coding/acm2/codec_manager_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.cc b/modules/audio_coding/acm2/rent_a_codec.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/rent_a_codec.cc
rename to modules/audio_coding/acm2/rent_a_codec.cc
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.h b/modules/audio_coding/acm2/rent_a_codec.h
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/rent_a_codec.h
rename to modules/audio_coding/acm2/rent_a_codec.h
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/modules/audio_coding/acm2/rent_a_codec_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc
rename to modules/audio_coding/acm2/rent_a_codec_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_coding.gni b/modules/audio_coding/audio_coding.gni
similarity index 100%
rename from webrtc/modules/audio_coding/audio_coding.gni
rename to modules/audio_coding/audio_coding.gni
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc
rename to modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
rename to modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
rename to modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc
rename to modules/audio_coding/audio_network_adaptor/bitrate_controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h
rename to modules/audio_coding/audio_network_adaptor/bitrate_controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc b/modules/audio_coding/audio_network_adaptor/channel_controller.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc
rename to modules/audio_coding/audio_network_adaptor/channel_controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h b/modules/audio_coding/audio_network_adaptor/channel_controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h
rename to modules/audio_coding/audio_network_adaptor/channel_controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/config.proto b/modules/audio_coding/audio_network_adaptor/config.proto
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/config.proto
rename to modules/audio_coding/audio_network_adaptor/config.proto
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller.cc b/modules/audio_coding/audio_network_adaptor/controller.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/controller.cc
rename to modules/audio_coding/audio_network_adaptor/controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller.h b/modules/audio_coding/audio_network_adaptor/controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/controller.h
rename to modules/audio_coding/audio_network_adaptor/controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/modules/audio_coding/audio_network_adaptor/controller_manager.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc
rename to modules/audio_coding/audio_network_adaptor/controller_manager.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h b/modules/audio_coding/audio_network_adaptor/controller_manager.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h
rename to modules/audio_coding/audio_network_adaptor/controller_manager.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.proto b/modules/audio_coding/audio_network_adaptor/debug_dump.proto
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.proto
rename to modules/audio_coding/audio_network_adaptor/debug_dump.proto
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
rename to modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
rename to modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc
rename to modules/audio_coding/audio_network_adaptor/dtx_controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/modules/audio_coding/audio_network_adaptor/dtx_controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h
rename to modules/audio_coding/audio_network_adaptor/dtx_controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
rename to modules/audio_coding/audio_network_adaptor/event_log_writer.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/modules/audio_coding/audio_network_adaptor/event_log_writer.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h
rename to modules/audio_coding/audio_network_adaptor/event_log_writer.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc
rename to modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
rename to modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc
rename to modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
rename to modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
rename to modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h
rename to modules/audio_coding/audio_network_adaptor/frame_length_controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h
rename to modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h
rename to modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h b/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h
rename to modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
rename to modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
rename to modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
rename to modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/parse_ana_dump.py b/modules/audio_coding/audio_network_adaptor/parse_ana_dump.py
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/parse_ana_dump.py
rename to modules/audio_coding/audio_network_adaptor/parse_ana_dump.py
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h b/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h
rename to modules/audio_coding/audio_network_adaptor/util/threshold_curve.h
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc b/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc
rename to modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/OWNERS b/modules/audio_coding/codecs/OWNERS
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/OWNERS
rename to modules/audio_coding/codecs/OWNERS
diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder.h b/modules/audio_coding/codecs/audio_decoder.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/audio_decoder.h
rename to modules/audio_coding/codecs/audio_decoder.h
diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.h b/modules/audio_coding/codecs/audio_encoder.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/audio_encoder.h
rename to modules/audio_coding/codecs/audio_encoder.h
diff --git a/webrtc/modules/audio_coding/codecs/audio_format_conversion.cc b/modules/audio_coding/codecs/audio_format_conversion.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/audio_format_conversion.cc
rename to modules/audio_coding/codecs/audio_format_conversion.cc
diff --git a/webrtc/modules/audio_coding/codecs/audio_format_conversion.h b/modules/audio_coding/codecs/audio_format_conversion.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/audio_format_conversion.h
rename to modules/audio_coding/codecs/audio_format_conversion.h
diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h b/modules/audio_coding/codecs/builtin_audio_decoder_factory.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h
rename to modules/audio_coding/codecs/builtin_audio_decoder_factory.h
diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc b/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc
rename to modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h b/modules/audio_coding/codecs/builtin_audio_encoder_factory.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h
rename to modules/audio_coding/codecs/builtin_audio_encoder_factory.h
diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc b/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc
rename to modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
rename to modules/audio_coding/codecs/cng/audio_encoder_cng.cc
diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/modules/audio_coding/codecs/cng/audio_encoder_cng.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h
rename to modules/audio_coding/codecs/cng/audio_encoder_cng.h
diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
rename to modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc
rename to modules/audio_coding/codecs/cng/cng_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc b/modules/audio_coding/codecs/cng/webrtc_cng.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc
rename to modules/audio_coding/codecs/cng/webrtc_cng.cc
diff --git a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h b/modules/audio_coding/codecs/cng/webrtc_cng.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h
rename to modules/audio_coding/codecs/cng/webrtc_cng.h
diff --git a/webrtc/modules/audio_coding/codecs/g711/OWNERS b/modules/audio_coding/codecs/g711/OWNERS
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/OWNERS
rename to modules/audio_coding/codecs/g711/OWNERS
diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc
rename to modules/audio_coding/codecs/g711/audio_decoder_pcm.cc
diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h
rename to modules/audio_coding/codecs/g711/audio_decoder_pcm.h
diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
rename to modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h
rename to modules/audio_coding/codecs/g711/audio_encoder_pcm.h
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.c b/modules/audio_coding/codecs/g711/g711.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/g711.c
rename to modules/audio_coding/codecs/g711/g711.c
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.h b/modules/audio_coding/codecs/g711/g711.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/g711.h
rename to modules/audio_coding/codecs/g711/g711.h
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711_interface.c b/modules/audio_coding/codecs/g711/g711_interface.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/g711_interface.c
rename to modules/audio_coding/codecs/g711/g711_interface.c
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711_interface.h b/modules/audio_coding/codecs/g711/g711_interface.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/g711_interface.h
rename to modules/audio_coding/codecs/g711/g711_interface.h
diff --git a/webrtc/modules/audio_coding/codecs/g711/test/testG711.cc b/modules/audio_coding/codecs/g711/test/testG711.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g711/test/testG711.cc
rename to modules/audio_coding/codecs/g711/test/testG711.cc
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc b/modules/audio_coding/codecs/g722/audio_decoder_g722.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc
rename to modules/audio_coding/codecs/g722/audio_decoder_g722.cc
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h b/modules/audio_coding/codecs/g722/audio_decoder_g722.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h
rename to modules/audio_coding/codecs/g722/audio_decoder_g722.h
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
rename to modules/audio_coding/codecs/g722/audio_encoder_g722.cc
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h b/modules/audio_coding/codecs/g722/audio_encoder_g722.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h
rename to modules/audio_coding/codecs/g722/audio_encoder_g722.h
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c b/modules/audio_coding/codecs/g722/g722_decode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/g722_decode.c
rename to modules/audio_coding/codecs/g722/g722_decode.c
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h b/modules/audio_coding/codecs/g722/g722_enc_dec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h
rename to modules/audio_coding/codecs/g722/g722_enc_dec.h
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_encode.c b/modules/audio_coding/codecs/g722/g722_encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/g722_encode.c
rename to modules/audio_coding/codecs/g722/g722_encode.c
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_interface.c b/modules/audio_coding/codecs/g722/g722_interface.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/g722_interface.c
rename to modules/audio_coding/codecs/g722/g722_interface.c
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_interface.h b/modules/audio_coding/codecs/g722/g722_interface.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/g722_interface.h
rename to modules/audio_coding/codecs/g722/g722_interface.h
diff --git a/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc b/modules/audio_coding/codecs/g722/test/testG722.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/g722/test/testG722.cc
rename to modules/audio_coding/codecs/g722/test/testG722.cc
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/abs_quant.c b/modules/audio_coding/codecs/ilbc/abs_quant.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/abs_quant.c
rename to modules/audio_coding/codecs/ilbc/abs_quant.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/abs_quant.h b/modules/audio_coding/codecs/ilbc/abs_quant.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/abs_quant.h
rename to modules/audio_coding/codecs/ilbc/abs_quant.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/abs_quant_loop.c b/modules/audio_coding/codecs/ilbc/abs_quant_loop.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/abs_quant_loop.c
rename to modules/audio_coding/codecs/ilbc/abs_quant_loop.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/abs_quant_loop.h b/modules/audio_coding/codecs/ilbc/abs_quant_loop.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/abs_quant_loop.h
rename to modules/audio_coding/codecs/ilbc/abs_quant_loop.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc
rename to modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
rename to modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
rename to modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
rename to modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c
rename to modules/audio_coding/codecs/ilbc/augmented_cb_corr.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h
rename to modules/audio_coding/codecs/ilbc/augmented_cb_corr.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/bw_expand.c b/modules/audio_coding/codecs/ilbc/bw_expand.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/bw_expand.c
rename to modules/audio_coding/codecs/ilbc/bw_expand.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/bw_expand.h b/modules/audio_coding/codecs/ilbc/bw_expand.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/bw_expand.h
rename to modules/audio_coding/codecs/ilbc/bw_expand.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_construct.c b/modules/audio_coding/codecs/ilbc/cb_construct.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_construct.c
rename to modules/audio_coding/codecs/ilbc/cb_construct.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_construct.h b/modules/audio_coding/codecs/ilbc/cb_construct.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_construct.h
rename to modules/audio_coding/codecs/ilbc/cb_construct.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.c
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.h
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
rename to modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_search.c b/modules/audio_coding/codecs/ilbc/cb_search.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_search.c
rename to modules/audio_coding/codecs/ilbc/cb_search.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_search.h b/modules/audio_coding/codecs/ilbc/cb_search.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_search.h
rename to modules/audio_coding/codecs/ilbc/cb_search.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_search_core.c b/modules/audio_coding/codecs/ilbc/cb_search_core.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_search_core.c
rename to modules/audio_coding/codecs/ilbc/cb_search_core.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_search_core.h b/modules/audio_coding/codecs/ilbc/cb_search_core.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_search_core.h
rename to modules/audio_coding/codecs/ilbc/cb_search_core.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_update_best_index.c b/modules/audio_coding/codecs/ilbc/cb_update_best_index.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_update_best_index.c
rename to modules/audio_coding/codecs/ilbc/cb_update_best_index.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_update_best_index.h b/modules/audio_coding/codecs/ilbc/cb_update_best_index.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/cb_update_best_index.h
rename to modules/audio_coding/codecs/ilbc/cb_update_best_index.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/chebyshev.c b/modules/audio_coding/codecs/ilbc/chebyshev.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/chebyshev.c
rename to modules/audio_coding/codecs/ilbc/chebyshev.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/chebyshev.h b/modules/audio_coding/codecs/ilbc/chebyshev.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/chebyshev.h
rename to modules/audio_coding/codecs/ilbc/chebyshev.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/comp_corr.c b/modules/audio_coding/codecs/ilbc/comp_corr.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/comp_corr.c
rename to modules/audio_coding/codecs/ilbc/comp_corr.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/comp_corr.h b/modules/audio_coding/codecs/ilbc/comp_corr.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/comp_corr.h
rename to modules/audio_coding/codecs/ilbc/comp_corr.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/complexityMeasures.m b/modules/audio_coding/codecs/ilbc/complexityMeasures.m
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/complexityMeasures.m
rename to modules/audio_coding/codecs/ilbc/complexityMeasures.m
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/constants.c b/modules/audio_coding/codecs/ilbc/constants.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/constants.c
rename to modules/audio_coding/codecs/ilbc/constants.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/constants.h b/modules/audio_coding/codecs/ilbc/constants.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/constants.h
rename to modules/audio_coding/codecs/ilbc/constants.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/create_augmented_vec.c b/modules/audio_coding/codecs/ilbc/create_augmented_vec.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/create_augmented_vec.c
rename to modules/audio_coding/codecs/ilbc/create_augmented_vec.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/create_augmented_vec.h b/modules/audio_coding/codecs/ilbc/create_augmented_vec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/create_augmented_vec.h
rename to modules/audio_coding/codecs/ilbc/create_augmented_vec.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode.c b/modules/audio_coding/codecs/ilbc/decode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decode.c
rename to modules/audio_coding/codecs/ilbc/decode.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode.h b/modules/audio_coding/codecs/ilbc/decode.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decode.h
rename to modules/audio_coding/codecs/ilbc/decode.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c b/modules/audio_coding/codecs/ilbc/decode_residual.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c
rename to modules/audio_coding/codecs/ilbc/decode_residual.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.h b/modules/audio_coding/codecs/ilbc/decode_residual.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decode_residual.h
rename to modules/audio_coding/codecs/ilbc/decode_residual.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c
rename to modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h
rename to modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/defines.h b/modules/audio_coding/codecs/ilbc/defines.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/defines.h
rename to modules/audio_coding/codecs/ilbc/defines.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/do_plc.c b/modules/audio_coding/codecs/ilbc/do_plc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/do_plc.c
rename to modules/audio_coding/codecs/ilbc/do_plc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/do_plc.h b/modules/audio_coding/codecs/ilbc/do_plc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/do_plc.h
rename to modules/audio_coding/codecs/ilbc/do_plc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/encode.c b/modules/audio_coding/codecs/ilbc/encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/encode.c
rename to modules/audio_coding/codecs/ilbc/encode.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/encode.h b/modules/audio_coding/codecs/ilbc/encode.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/encode.h
rename to modules/audio_coding/codecs/ilbc/encode.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/energy_inverse.c b/modules/audio_coding/codecs/ilbc/energy_inverse.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/energy_inverse.c
rename to modules/audio_coding/codecs/ilbc/energy_inverse.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/energy_inverse.h b/modules/audio_coding/codecs/ilbc/energy_inverse.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/energy_inverse.h
rename to modules/audio_coding/codecs/ilbc/energy_inverse.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enh_upsample.c b/modules/audio_coding/codecs/ilbc/enh_upsample.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enh_upsample.c
rename to modules/audio_coding/codecs/ilbc/enh_upsample.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enh_upsample.h b/modules/audio_coding/codecs/ilbc/enh_upsample.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enh_upsample.h
rename to modules/audio_coding/codecs/ilbc/enh_upsample.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer.c b/modules/audio_coding/codecs/ilbc/enhancer.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enhancer.c
rename to modules/audio_coding/codecs/ilbc/enhancer.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer.h b/modules/audio_coding/codecs/ilbc/enhancer.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enhancer.h
rename to modules/audio_coding/codecs/ilbc/enhancer.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c b/modules/audio_coding/codecs/ilbc/enhancer_interface.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c
rename to modules/audio_coding/codecs/ilbc/enhancer_interface.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.h b/modules/audio_coding/codecs/ilbc/enhancer_interface.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.h
rename to modules/audio_coding/codecs/ilbc/enhancer_interface.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c
rename to modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h
rename to modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c b/modules/audio_coding/codecs/ilbc/frame_classify.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c
rename to modules/audio_coding/codecs/ilbc/frame_classify.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.h b/modules/audio_coding/codecs/ilbc/frame_classify.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/frame_classify.h
rename to modules/audio_coding/codecs/ilbc/frame_classify.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/gain_dequant.c b/modules/audio_coding/codecs/ilbc/gain_dequant.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/gain_dequant.c
rename to modules/audio_coding/codecs/ilbc/gain_dequant.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/gain_dequant.h b/modules/audio_coding/codecs/ilbc/gain_dequant.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/gain_dequant.h
rename to modules/audio_coding/codecs/ilbc/gain_dequant.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/gain_quant.c b/modules/audio_coding/codecs/ilbc/gain_quant.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/gain_quant.c
rename to modules/audio_coding/codecs/ilbc/gain_quant.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/gain_quant.h b/modules/audio_coding/codecs/ilbc/gain_quant.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/gain_quant.h
rename to modules/audio_coding/codecs/ilbc/gain_quant.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c b/modules/audio_coding/codecs/ilbc/get_cd_vec.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c
rename to modules/audio_coding/codecs/ilbc/get_cd_vec.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.h b/modules/audio_coding/codecs/ilbc/get_cd_vec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.h
rename to modules/audio_coding/codecs/ilbc/get_cd_vec.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_lsp_poly.c b/modules/audio_coding/codecs/ilbc/get_lsp_poly.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_lsp_poly.c
rename to modules/audio_coding/codecs/ilbc/get_lsp_poly.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_lsp_poly.h b/modules/audio_coding/codecs/ilbc/get_lsp_poly.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_lsp_poly.h
rename to modules/audio_coding/codecs/ilbc/get_lsp_poly.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_sync_seq.c b/modules/audio_coding/codecs/ilbc/get_sync_seq.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_sync_seq.c
rename to modules/audio_coding/codecs/ilbc/get_sync_seq.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_sync_seq.h b/modules/audio_coding/codecs/ilbc/get_sync_seq.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/get_sync_seq.h
rename to modules/audio_coding/codecs/ilbc/get_sync_seq.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/hp_input.c b/modules/audio_coding/codecs/ilbc/hp_input.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/hp_input.c
rename to modules/audio_coding/codecs/ilbc/hp_input.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/hp_input.h b/modules/audio_coding/codecs/ilbc/hp_input.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/hp_input.h
rename to modules/audio_coding/codecs/ilbc/hp_input.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/hp_output.c b/modules/audio_coding/codecs/ilbc/hp_output.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/hp_output.c
rename to modules/audio_coding/codecs/ilbc/hp_output.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/hp_output.h b/modules/audio_coding/codecs/ilbc/hp_output.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/hp_output.h
rename to modules/audio_coding/codecs/ilbc/hp_output.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.c b/modules/audio_coding/codecs/ilbc/ilbc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
rename to modules/audio_coding/codecs/ilbc/ilbc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.h b/modules/audio_coding/codecs/ilbc/ilbc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/ilbc.h
rename to modules/audio_coding/codecs/ilbc/ilbc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
rename to modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/index_conv_dec.c b/modules/audio_coding/codecs/ilbc/index_conv_dec.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/index_conv_dec.c
rename to modules/audio_coding/codecs/ilbc/index_conv_dec.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/index_conv_dec.h b/modules/audio_coding/codecs/ilbc/index_conv_dec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/index_conv_dec.h
rename to modules/audio_coding/codecs/ilbc/index_conv_dec.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/index_conv_enc.c b/modules/audio_coding/codecs/ilbc/index_conv_enc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/index_conv_enc.c
rename to modules/audio_coding/codecs/ilbc/index_conv_enc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/index_conv_enc.h b/modules/audio_coding/codecs/ilbc/index_conv_enc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/index_conv_enc.h
rename to modules/audio_coding/codecs/ilbc/index_conv_enc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/init_decode.c b/modules/audio_coding/codecs/ilbc/init_decode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/init_decode.c
rename to modules/audio_coding/codecs/ilbc/init_decode.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/init_decode.h b/modules/audio_coding/codecs/ilbc/init_decode.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/init_decode.h
rename to modules/audio_coding/codecs/ilbc/init_decode.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/init_encode.c b/modules/audio_coding/codecs/ilbc/init_encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/init_encode.c
rename to modules/audio_coding/codecs/ilbc/init_encode.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/init_encode.h b/modules/audio_coding/codecs/ilbc/init_encode.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/init_encode.h
rename to modules/audio_coding/codecs/ilbc/init_encode.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interpolate.c b/modules/audio_coding/codecs/ilbc/interpolate.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/interpolate.c
rename to modules/audio_coding/codecs/ilbc/interpolate.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interpolate.h b/modules/audio_coding/codecs/ilbc/interpolate.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/interpolate.h
rename to modules/audio_coding/codecs/ilbc/interpolate.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interpolate_samples.c b/modules/audio_coding/codecs/ilbc/interpolate_samples.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/interpolate_samples.c
rename to modules/audio_coding/codecs/ilbc/interpolate_samples.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interpolate_samples.h b/modules/audio_coding/codecs/ilbc/interpolate_samples.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/interpolate_samples.h
rename to modules/audio_coding/codecs/ilbc/interpolate_samples.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lpc_encode.c b/modules/audio_coding/codecs/ilbc/lpc_encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lpc_encode.c
rename to modules/audio_coding/codecs/ilbc/lpc_encode.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lpc_encode.h b/modules/audio_coding/codecs/ilbc/lpc_encode.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lpc_encode.h
rename to modules/audio_coding/codecs/ilbc/lpc_encode.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_check.c b/modules/audio_coding/codecs/ilbc/lsf_check.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_check.c
rename to modules/audio_coding/codecs/ilbc/lsf_check.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_check.h b/modules/audio_coding/codecs/ilbc/lsf_check.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_check.h
rename to modules/audio_coding/codecs/ilbc/lsf_check.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c
rename to modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h
rename to modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c
rename to modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h
rename to modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c
rename to modules/audio_coding/codecs/ilbc/lsf_to_lsp.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h
rename to modules/audio_coding/codecs/ilbc/lsf_to_lsp.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_poly.c b/modules/audio_coding/codecs/ilbc/lsf_to_poly.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_to_poly.c
rename to modules/audio_coding/codecs/ilbc/lsf_to_poly.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_poly.h b/modules/audio_coding/codecs/ilbc/lsf_to_poly.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsf_to_poly.h
rename to modules/audio_coding/codecs/ilbc/lsf_to_poly.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c
rename to modules/audio_coding/codecs/ilbc/lsp_to_lsf.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h
rename to modules/audio_coding/codecs/ilbc/lsp_to_lsf.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/my_corr.c b/modules/audio_coding/codecs/ilbc/my_corr.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/my_corr.c
rename to modules/audio_coding/codecs/ilbc/my_corr.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/my_corr.h b/modules/audio_coding/codecs/ilbc/my_corr.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/my_corr.h
rename to modules/audio_coding/codecs/ilbc/my_corr.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/nearest_neighbor.c b/modules/audio_coding/codecs/ilbc/nearest_neighbor.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/nearest_neighbor.c
rename to modules/audio_coding/codecs/ilbc/nearest_neighbor.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/nearest_neighbor.h b/modules/audio_coding/codecs/ilbc/nearest_neighbor.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/nearest_neighbor.h
rename to modules/audio_coding/codecs/ilbc/nearest_neighbor.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/pack_bits.c b/modules/audio_coding/codecs/ilbc/pack_bits.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/pack_bits.c
rename to modules/audio_coding/codecs/ilbc/pack_bits.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/pack_bits.h b/modules/audio_coding/codecs/ilbc/pack_bits.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/pack_bits.h
rename to modules/audio_coding/codecs/ilbc/pack_bits.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsf.c b/modules/audio_coding/codecs/ilbc/poly_to_lsf.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsf.c
rename to modules/audio_coding/codecs/ilbc/poly_to_lsf.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsf.h b/modules/audio_coding/codecs/ilbc/poly_to_lsf.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsf.h
rename to modules/audio_coding/codecs/ilbc/poly_to_lsf.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c b/modules/audio_coding/codecs/ilbc/poly_to_lsp.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c
rename to modules/audio_coding/codecs/ilbc/poly_to_lsp.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.h b/modules/audio_coding/codecs/ilbc/poly_to_lsp.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.h
rename to modules/audio_coding/codecs/ilbc/poly_to_lsp.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/refiner.c b/modules/audio_coding/codecs/ilbc/refiner.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/refiner.c
rename to modules/audio_coding/codecs/ilbc/refiner.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/refiner.h b/modules/audio_coding/codecs/ilbc/refiner.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/refiner.h
rename to modules/audio_coding/codecs/ilbc/refiner.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c
rename to modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h
rename to modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c
rename to modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h
rename to modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c
rename to modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h
rename to modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c
rename to modules/audio_coding/codecs/ilbc/simple_lsf_quant.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h
rename to modules/audio_coding/codecs/ilbc/simple_lsf_quant.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/smooth.c b/modules/audio_coding/codecs/ilbc/smooth.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/smooth.c
rename to modules/audio_coding/codecs/ilbc/smooth.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/smooth.h b/modules/audio_coding/codecs/ilbc/smooth.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/smooth.h
rename to modules/audio_coding/codecs/ilbc/smooth.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c b/modules/audio_coding/codecs/ilbc/smooth_out_data.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c
rename to modules/audio_coding/codecs/ilbc/smooth_out_data.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.h b/modules/audio_coding/codecs/ilbc/smooth_out_data.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.h
rename to modules/audio_coding/codecs/ilbc/smooth_out_data.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/sort_sq.c b/modules/audio_coding/codecs/ilbc/sort_sq.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/sort_sq.c
rename to modules/audio_coding/codecs/ilbc/sort_sq.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/sort_sq.h b/modules/audio_coding/codecs/ilbc/sort_sq.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/sort_sq.h
rename to modules/audio_coding/codecs/ilbc/sort_sq.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/split_vq.c b/modules/audio_coding/codecs/ilbc/split_vq.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/split_vq.c
rename to modules/audio_coding/codecs/ilbc/split_vq.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/split_vq.h b/modules/audio_coding/codecs/ilbc/split_vq.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/split_vq.h
rename to modules/audio_coding/codecs/ilbc/split_vq.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/state_construct.c b/modules/audio_coding/codecs/ilbc/state_construct.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/state_construct.c
rename to modules/audio_coding/codecs/ilbc/state_construct.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/state_construct.h b/modules/audio_coding/codecs/ilbc/state_construct.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/state_construct.h
rename to modules/audio_coding/codecs/ilbc/state_construct.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/state_search.c b/modules/audio_coding/codecs/ilbc/state_search.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/state_search.c
rename to modules/audio_coding/codecs/ilbc/state_search.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/state_search.h b/modules/audio_coding/codecs/ilbc/state_search.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/state_search.h
rename to modules/audio_coding/codecs/ilbc/state_search.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/swap_bytes.c b/modules/audio_coding/codecs/ilbc/swap_bytes.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/swap_bytes.c
rename to modules/audio_coding/codecs/ilbc/swap_bytes.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/swap_bytes.h b/modules/audio_coding/codecs/ilbc/swap_bytes.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/swap_bytes.h
rename to modules/audio_coding/codecs/ilbc/swap_bytes.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/test/empty.cc b/modules/audio_coding/codecs/ilbc/test/empty.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/test/empty.cc
rename to modules/audio_coding/codecs/ilbc/test/empty.cc
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_test.c b/modules/audio_coding/codecs/ilbc/test/iLBC_test.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_test.c
rename to modules/audio_coding/codecs/ilbc/test/iLBC_test.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c b/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c
rename to modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c b/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c
rename to modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt b/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt
rename to modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/unpack_bits.c b/modules/audio_coding/codecs/ilbc/unpack_bits.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/unpack_bits.c
rename to modules/audio_coding/codecs/ilbc/unpack_bits.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/unpack_bits.h b/modules/audio_coding/codecs/ilbc/unpack_bits.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/unpack_bits.h
rename to modules/audio_coding/codecs/ilbc/unpack_bits.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq3.c b/modules/audio_coding/codecs/ilbc/vq3.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/vq3.c
rename to modules/audio_coding/codecs/ilbc/vq3.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq3.h b/modules/audio_coding/codecs/ilbc/vq3.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/vq3.h
rename to modules/audio_coding/codecs/ilbc/vq3.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq4.c b/modules/audio_coding/codecs/ilbc/vq4.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/vq4.c
rename to modules/audio_coding/codecs/ilbc/vq4.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq4.h b/modules/audio_coding/codecs/ilbc/vq4.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/vq4.h
rename to modules/audio_coding/codecs/ilbc/vq4.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/window32_w32.c b/modules/audio_coding/codecs/ilbc/window32_w32.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/window32_w32.c
rename to modules/audio_coding/codecs/ilbc/window32_w32.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/window32_w32.h b/modules/audio_coding/codecs/ilbc/window32_w32.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/window32_w32.h
rename to modules/audio_coding/codecs/ilbc/window32_w32.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/xcorr_coef.c b/modules/audio_coding/codecs/ilbc/xcorr_coef.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/xcorr_coef.c
rename to modules/audio_coding/codecs/ilbc/xcorr_coef.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/xcorr_coef.h b/modules/audio_coding/codecs/ilbc/xcorr_coef.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/ilbc/xcorr_coef.h
rename to modules/audio_coding/codecs/ilbc/xcorr_coef.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
rename to modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h
rename to modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
rename to modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
rename to modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h b/modules/audio_coding/codecs/isac/bandwidth_info.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h
rename to modules/audio_coding/codecs/isac/bandwidth_info.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/empty.cc b/modules/audio_coding/codecs/isac/empty.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/empty.cc
rename to modules/audio_coding/codecs/isac/empty.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h b/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h
rename to modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h b/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h
rename to modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h b/modules/audio_coding/codecs/isac/fix/include/isacfix.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h
rename to modules/audio_coding/codecs/isac/fix/include/isacfix.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines.c b/modules/audio_coding/codecs/isac/fix/source/arith_routines.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines.c
rename to modules/audio_coding/codecs/isac/fix/source/arith_routines.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_hist.c b/modules/audio_coding/codecs/isac/fix/source/arith_routines_hist.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_hist.c
rename to modules/audio_coding/codecs/isac/fix/source/arith_routines_hist.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c b/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c
rename to modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routins.h b/modules/audio_coding/codecs/isac/fix/source/arith_routins.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routins.h
rename to modules/audio_coding/codecs/isac/fix/source/arith_routins.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc b/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc
rename to modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc b/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
rename to modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c
rename to modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h
rename to modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h b/modules/audio_coding/codecs/isac/fix/source/codec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h
rename to modules/audio_coding/codecs/isac/fix/source/codec.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/decode.c b/modules/audio_coding/codecs/isac/fix/source/decode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/decode.c
rename to modules/audio_coding/codecs/isac/fix/source/decode.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/decode_bwe.c b/modules/audio_coding/codecs/isac/fix/source/decode_bwe.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/decode_bwe.c
rename to modules/audio_coding/codecs/isac/fix/source/decode_bwe.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c b/modules/audio_coding/codecs/isac/fix/source/decode_plc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c
rename to modules/audio_coding/codecs/isac/fix/source/decode_plc.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/encode.c b/modules/audio_coding/codecs/isac/fix/source/encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/encode.c
rename to modules/audio_coding/codecs/isac/fix/source/encode.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
rename to modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h
rename to modules/audio_coding/codecs/isac/fix/source/entropy_coding.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c
rename to modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c b/modules/audio_coding/codecs/isac/fix/source/fft.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c
rename to modules/audio_coding/codecs/isac/fix/source/fft.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.h b/modules/audio_coding/codecs/isac/fix/source/fft.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/fft.h
rename to modules/audio_coding/codecs/isac/fix/source/fft.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
rename to modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
rename to modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c
rename to modules/audio_coding/codecs/isac/fix/source/filterbanks.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c
rename to modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
rename to modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters.c b/modules/audio_coding/codecs/isac/fix/source/filters.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filters.c
rename to modules/audio_coding/codecs/isac/fix/source/filters.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c b/modules/audio_coding/codecs/isac/fix/source/filters_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/filters_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_neon.c b/modules/audio_coding/codecs/isac/fix/source/filters_neon.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filters_neon.c
rename to modules/audio_coding/codecs/isac/fix/source/filters_neon.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
rename to modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c b/modules/audio_coding/codecs/isac/fix/source/initialize.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c
rename to modules/audio_coding/codecs/isac/fix/source/initialize.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h b/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h
rename to modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/modules/audio_coding/codecs/isac/fix/source/isacfix.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
rename to modules/audio_coding/codecs/isac/fix/source/isacfix.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/modules/audio_coding/codecs/isac/fix/source/lattice.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
rename to modules/audio_coding/codecs/isac/fix/source/lattice.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S b/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S
rename to modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
rename to modules/audio_coding/codecs/isac/fix/source/lattice_c.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/lattice_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c b/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c
rename to modules/audio_coding/codecs/isac/fix/source/lattice_neon.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c
rename to modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h
rename to modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
rename to modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
rename to modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h
rename to modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_filter.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S
rename to modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
rename to modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
rename to modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h b/modules/audio_coding/codecs/isac/fix/source/settings.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h
rename to modules/audio_coding/codecs/isac/fix/source/settings.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
rename to modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h b/modules/audio_coding/codecs/isac/fix/source/structs.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h
rename to modules/audio_coding/codecs/isac/fix/source/structs.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c b/modules/audio_coding/codecs/isac/fix/source/transform.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c
rename to modules/audio_coding/codecs/isac/fix/source/transform.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_mips.c b/modules/audio_coding/codecs/isac/fix/source/transform_mips.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/transform_mips.c
rename to modules/audio_coding/codecs/isac/fix/source/transform_mips.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c b/modules/audio_coding/codecs/isac/fix/source/transform_neon.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c
rename to modules/audio_coding/codecs/isac/fix/source/transform_neon.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_tables.c b/modules/audio_coding/codecs/isac/fix/source/transform_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/transform_tables.c
rename to modules/audio_coding/codecs/isac/fix/source/transform_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
rename to modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/ChannelFiles.txt b/modules/audio_coding/codecs/isac/fix/test/QA/ChannelFiles.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/ChannelFiles.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/ChannelFiles.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/InputFiles.txt b/modules/audio_coding/codecs/isac/fix/test/QA/InputFiles.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/InputFiles.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/InputFiles.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/InputFilesFew.txt b/modules/audio_coding/codecs/isac/fix/test/QA/InputFilesFew.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/InputFilesFew.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/InputFilesFew.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/ListOfTestCases.xls b/modules/audio_coding/codecs/isac/fix/test/QA/ListOfTestCases.xls
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/ListOfTestCases.xls
rename to modules/audio_coding/codecs/isac/fix/test/QA/ListOfTestCases.xls
Binary files differ
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/diffiSAC.txt b/modules/audio_coding/codecs/isac/fix/test/QA/diffiSAC.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/diffiSAC.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/diffiSAC.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/diffiSACPLC.txt b/modules/audio_coding/codecs/isac/fix/test/QA/diffiSACPLC.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/diffiSACPLC.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/diffiSACPLC.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACLongtest.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACLongtest.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACLongtest.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACLongtest.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACNB.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACNB.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACNB.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACNB.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACPLC.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACPLC.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACPLC.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACPLC.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACRate.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACRate.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACRate.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACRate.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfault.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfault.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfault.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACfault.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfixfloat.txt b/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfixfloat.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/QA/runiSACfixfloat.txt
rename to modules/audio_coding/codecs/isac/fix/test/QA/runiSACfixfloat.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc b/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
rename to modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/kenny.cc b/modules/audio_coding/codecs/isac/fix/test/kenny.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/fix/test/kenny.cc
rename to modules/audio_coding/codecs/isac/fix/test/kenny.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc b/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc
rename to modules/audio_coding/codecs/isac/locked_bandwidth_info.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
rename to modules/audio_coding/codecs/isac/locked_bandwidth_info.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h b/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h
rename to modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h b/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h
rename to modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/include/isac.h b/modules/audio_coding/codecs/isac/main/include/isac.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/include/isac.h
rename to modules/audio_coding/codecs/isac/main/include/isac.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines.c b/modules/audio_coding/codecs/isac/main/source/arith_routines.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines.c
rename to modules/audio_coding/codecs/isac/main/source/arith_routines.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines.h b/modules/audio_coding/codecs/isac/main/source/arith_routines.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines.h
rename to modules/audio_coding/codecs/isac/main/source/arith_routines.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c b/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c
rename to modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c b/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c
rename to modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc b/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc
rename to modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
rename to modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
rename to modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c
rename to modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
rename to modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/codec.h b/modules/audio_coding/codecs/isac/main/source/codec.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
rename to modules/audio_coding/codecs/isac/main/source/codec.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.c b/modules/audio_coding/codecs/isac/main/source/crc.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/crc.c
rename to modules/audio_coding/codecs/isac/main/source/crc.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h b/modules/audio_coding/codecs/isac/main/source/crc.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/crc.h
rename to modules/audio_coding/codecs/isac/main/source/crc.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/decode.c b/modules/audio_coding/codecs/isac/main/source/decode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/decode.c
rename to modules/audio_coding/codecs/isac/main/source/decode.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/decode_bwe.c b/modules/audio_coding/codecs/isac/main/source/decode_bwe.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/decode_bwe.c
rename to modules/audio_coding/codecs/isac/main/source/decode_bwe.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode.c b/modules/audio_coding/codecs/isac/main/source/encode.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/encode.c
rename to modules/audio_coding/codecs/isac/main/source/encode.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
rename to modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
rename to modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c b/modules/audio_coding/codecs/isac/main/source/entropy_coding.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c
rename to modules/audio_coding/codecs/isac/main/source/entropy_coding.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.h b/modules/audio_coding/codecs/isac/main/source/entropy_coding.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.h
rename to modules/audio_coding/codecs/isac/main/source/entropy_coding.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/fft.c b/modules/audio_coding/codecs/isac/main/source/fft.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/fft.c
rename to modules/audio_coding/codecs/isac/main/source/fft.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/fft.h b/modules/audio_coding/codecs/isac/main/source/fft.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/fft.h
rename to modules/audio_coding/codecs/isac/main/source/fft.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/filter_functions.c b/modules/audio_coding/codecs/isac/main/source/filter_functions.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/filter_functions.c
rename to modules/audio_coding/codecs/isac/main/source/filter_functions.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/filterbank_tables.c b/modules/audio_coding/codecs/isac/main/source/filterbank_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/filterbank_tables.c
rename to modules/audio_coding/codecs/isac/main/source/filterbank_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h
rename to modules/audio_coding/codecs/isac/main/source/filterbank_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/filterbanks.c b/modules/audio_coding/codecs/isac/main/source/filterbanks.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/filterbanks.c
rename to modules/audio_coding/codecs/isac/main/source/filterbanks.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/intialize.c b/modules/audio_coding/codecs/isac/main/source/intialize.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/intialize.c
rename to modules/audio_coding/codecs/isac/main/source/intialize.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.c b/modules/audio_coding/codecs/isac/main/source/isac.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/isac.c
rename to modules/audio_coding/codecs/isac/main/source/isac.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac_float_type.h b/modules/audio_coding/codecs/isac/main/source/isac_float_type.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/isac_float_type.h
rename to modules/audio_coding/codecs/isac/main/source/isac_float_type.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
rename to modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lattice.c b/modules/audio_coding/codecs/isac/main/source/lattice.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lattice.c
rename to modules/audio_coding/codecs/isac/main/source/lattice.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c b/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c
rename to modules/audio_coding/codecs/isac/main/source/lpc_analysis.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h b/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h
rename to modules/audio_coding/codecs/isac/main/source/lpc_analysis.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
rename to modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
rename to modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
rename to modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
rename to modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
rename to modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
rename to modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_tables.c
rename to modules/audio_coding/codecs/isac/main/source/lpc_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/lpc_tables.h
rename to modules/audio_coding/codecs/isac/main/source/lpc_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
rename to modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c b/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c
rename to modules/audio_coding/codecs/isac/main/source/pitch_estimator.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h b/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h
rename to modules/audio_coding/codecs/isac/main/source/pitch_estimator.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_filter.c b/modules/audio_coding/codecs/isac/main/source/pitch_filter.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_filter.c
rename to modules/audio_coding/codecs/isac/main/source/pitch_filter.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c
rename to modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
rename to modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c
rename to modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
rename to modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/settings.h b/modules/audio_coding/codecs/isac/main/source/settings.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/settings.h
rename to modules/audio_coding/codecs/isac/main/source/settings.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c b/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c
rename to modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h
rename to modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/structs.h b/modules/audio_coding/codecs/isac/main/source/structs.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/structs.h
rename to modules/audio_coding/codecs/isac/main/source/structs.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/transform.c b/modules/audio_coding/codecs/isac/main/source/transform.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/source/transform.c
rename to modules/audio_coding/codecs/isac/main/source/transform.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACLongtest.txt b/modules/audio_coding/codecs/isac/main/test/QA/runiSACLongtest.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACLongtest.txt
rename to modules/audio_coding/codecs/isac/main/test/QA/runiSACLongtest.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACfault.txt b/modules/audio_coding/codecs/isac/main/test/QA/runiSACfault.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACfault.txt
rename to modules/audio_coding/codecs/isac/main/test/QA/runiSACfault.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACfixfloat.txt b/modules/audio_coding/codecs/isac/main/test/QA/runiSACfixfloat.txt
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACfixfloat.txt
rename to modules/audio_coding/codecs/isac/main/test/QA/runiSACfixfloat.txt
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc b/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
rename to modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc b/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
rename to modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.c b/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
rename to modules/audio_coding/codecs/isac/main/test/simpleKenny.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/util/utility.c b/modules/audio_coding/codecs/isac/main/util/utility.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/util/utility.c
rename to modules/audio_coding/codecs/isac/main/util/utility.c
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/util/utility.h b/modules/audio_coding/codecs/isac/main/util/utility.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/main/util/utility.h
rename to modules/audio_coding/codecs/isac/main/util/utility.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/isac/unittest.cc
rename to modules/audio_coding/codecs/isac/unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc
rename to modules/audio_coding/codecs/legacy_encoded_audio_frame.cc
diff --git a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h b/modules/audio_coding/codecs/legacy_encoded_audio_frame.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h
rename to modules/audio_coding/codecs/legacy_encoded_audio_frame.h
diff --git a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
rename to modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc b/modules/audio_coding/codecs/opus/audio_decoder_opus.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc
rename to modules/audio_coding/codecs/opus/audio_decoder_opus.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/modules/audio_coding/codecs/opus/audio_decoder_opus.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h
rename to modules/audio_coding/codecs/opus/audio_decoder_opus.h
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
rename to modules/audio_coding/codecs/opus/audio_encoder_opus.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
rename to modules/audio_coding/codecs/opus/audio_encoder_opus.h
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
rename to modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
rename to modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc
rename to modules/audio_coding/codecs/opus/opus_fec_test.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_inst.h b/modules/audio_coding/codecs/opus/opus_inst.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_inst.h
rename to modules/audio_coding/codecs/opus/opus_inst.h
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_interface.c b/modules/audio_coding/codecs/opus/opus_interface.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_interface.c
rename to modules/audio_coding/codecs/opus/opus_interface.c
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_interface.h b/modules/audio_coding/codecs/opus/opus_interface.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_interface.h
rename to modules/audio_coding/codecs/opus/opus_interface.h
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc b/modules/audio_coding/codecs/opus/opus_speed_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
rename to modules/audio_coding/codecs/opus/opus_speed_test.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc
rename to modules/audio_coding/codecs/opus/opus_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc
rename to modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
rename to modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
rename to modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
rename to modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c b/modules/audio_coding/codecs/pcm16b/pcm16b.c
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
rename to modules/audio_coding/codecs/pcm16b/pcm16b.c
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h b/modules/audio_coding/codecs/pcm16b/pcm16b.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h
rename to modules/audio_coding/codecs/pcm16b/pcm16b.h
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc b/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc
rename to modules/audio_coding/codecs/pcm16b/pcm16b_common.cc
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h b/modules/audio_coding/codecs/pcm16b/pcm16b_common.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h
rename to modules/audio_coding/codecs/pcm16b/pcm16b_common.h
diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc
rename to modules/audio_coding/codecs/red/audio_encoder_copy_red.cc
diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h
rename to modules/audio_coding/codecs/red/audio_encoder_copy_red.h
diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
rename to modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
rename to modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
rename to modules/audio_coding/codecs/tools/audio_codec_speed_test.h
diff --git a/webrtc/modules/audio_coding/include/audio_coding_module.h b/modules/audio_coding/include/audio_coding_module.h
similarity index 100%
rename from webrtc/modules/audio_coding/include/audio_coding_module.h
rename to modules/audio_coding/include/audio_coding_module.h
diff --git a/webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h b/modules/audio_coding/include/audio_coding_module_typedefs.h
similarity index 100%
rename from webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h
rename to modules/audio_coding/include/audio_coding_module_typedefs.h
diff --git a/webrtc/modules/audio_coding/neteq/accelerate.cc b/modules/audio_coding/neteq/accelerate.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/accelerate.cc
rename to modules/audio_coding/neteq/accelerate.cc
diff --git a/webrtc/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/accelerate.h
rename to modules/audio_coding/neteq/accelerate.h
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/modules/audio_coding/neteq/audio_decoder_impl.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
rename to modules/audio_coding/neteq/audio_decoder_impl.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/modules/audio_coding/neteq/audio_decoder_impl.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
rename to modules/audio_coding/neteq/audio_decoder_impl.h
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
rename to modules/audio_coding/neteq/audio_decoder_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc b/modules/audio_coding/neteq/audio_multi_vector.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_multi_vector.cc
rename to modules/audio_coding/neteq/audio_multi_vector.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_multi_vector.h
rename to modules/audio_coding/neteq/audio_multi_vector.h
diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
rename to modules/audio_coding/neteq/audio_multi_vector_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.cc b/modules/audio_coding/neteq/audio_vector.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_vector.cc
rename to modules/audio_coding/neteq/audio_vector.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_vector.h
rename to modules/audio_coding/neteq/audio_vector.h
diff --git a/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
rename to modules/audio_coding/neteq/audio_vector_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/background_noise.cc b/modules/audio_coding/neteq/background_noise.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/background_noise.cc
rename to modules/audio_coding/neteq/background_noise.cc
diff --git a/webrtc/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/background_noise.h
rename to modules/audio_coding/neteq/background_noise.h
diff --git a/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc b/modules/audio_coding/neteq/background_noise_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/background_noise_unittest.cc
rename to modules/audio_coding/neteq/background_noise_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc b/modules/audio_coding/neteq/buffer_level_filter.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/buffer_level_filter.cc
rename to modules/audio_coding/neteq/buffer_level_filter.cc
diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h b/modules/audio_coding/neteq/buffer_level_filter.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/buffer_level_filter.h
rename to modules/audio_coding/neteq/buffer_level_filter.h
diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
rename to modules/audio_coding/neteq/buffer_level_filter_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.cc b/modules/audio_coding/neteq/comfort_noise.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/comfort_noise.cc
rename to modules/audio_coding/neteq/comfort_noise.cc
diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/comfort_noise.h
rename to modules/audio_coding/neteq/comfort_noise.h
diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc b/modules/audio_coding/neteq/comfort_noise_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc
rename to modules/audio_coding/neteq/comfort_noise_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/cross_correlation.cc b/modules/audio_coding/neteq/cross_correlation.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/cross_correlation.cc
rename to modules/audio_coding/neteq/cross_correlation.cc
diff --git a/webrtc/modules/audio_coding/neteq/cross_correlation.h b/modules/audio_coding/neteq/cross_correlation.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/cross_correlation.h
rename to modules/audio_coding/neteq/cross_correlation.h
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic.cc
rename to modules/audio_coding/neteq/decision_logic.cc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic.h
rename to modules/audio_coding/neteq/decision_logic.h
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc b/modules/audio_coding/neteq/decision_logic_fax.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
rename to modules/audio_coding/neteq/decision_logic_fax.cc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h b/modules/audio_coding/neteq/decision_logic_fax.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic_fax.h
rename to modules/audio_coding/neteq/decision_logic_fax.h
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc b/modules/audio_coding/neteq/decision_logic_normal.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
rename to modules/audio_coding/neteq/decision_logic_normal.cc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h b/modules/audio_coding/neteq/decision_logic_normal.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic_normal.h
rename to modules/audio_coding/neteq/decision_logic_normal.h
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc
rename to modules/audio_coding/neteq/decision_logic_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.cc b/modules/audio_coding/neteq/decoder_database.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decoder_database.cc
rename to modules/audio_coding/neteq/decoder_database.cc
diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decoder_database.h
rename to modules/audio_coding/neteq/decoder_database.h
diff --git a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc
rename to modules/audio_coding/neteq/decoder_database_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/defines.h b/modules/audio_coding/neteq/defines.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/defines.h
rename to modules/audio_coding/neteq/defines.h
diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_manager.cc
rename to modules/audio_coding/neteq/delay_manager.cc
diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_manager.h
rename to modules/audio_coding/neteq/delay_manager.h
diff --git a/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc
rename to modules/audio_coding/neteq/delay_manager_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc b/modules/audio_coding/neteq/delay_peak_detector.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_peak_detector.cc
rename to modules/audio_coding/neteq/delay_peak_detector.cc
diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_peak_detector.h
rename to modules/audio_coding/neteq/delay_peak_detector.h
diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
rename to modules/audio_coding/neteq/delay_peak_detector_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper.cc b/modules/audio_coding/neteq/dsp_helper.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dsp_helper.cc
rename to modules/audio_coding/neteq/dsp_helper.cc
diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dsp_helper.h
rename to modules/audio_coding/neteq/dsp_helper.h
diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc
rename to modules/audio_coding/neteq/dsp_helper_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc b/modules/audio_coding/neteq/dtmf_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_buffer.cc
rename to modules/audio_coding/neteq/dtmf_buffer.cc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_buffer.h
rename to modules/audio_coding/neteq/dtmf_buffer.h
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
rename to modules/audio_coding/neteq/dtmf_buffer_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc b/modules/audio_coding/neteq/dtmf_tone_generator.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc
rename to modules/audio_coding/neteq/dtmf_tone_generator.cc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
rename to modules/audio_coding/neteq/dtmf_tone_generator.h
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
rename to modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/expand.cc b/modules/audio_coding/neteq/expand.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/expand.cc
rename to modules/audio_coding/neteq/expand.cc
diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/expand.h
rename to modules/audio_coding/neteq/expand.h
diff --git a/webrtc/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/expand_unittest.cc
rename to modules/audio_coding/neteq/expand_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/include/neteq.h
rename to modules/audio_coding/neteq/include/neteq.h
diff --git a/webrtc/modules/audio_coding/neteq/merge.cc b/modules/audio_coding/neteq/merge.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/merge.cc
rename to modules/audio_coding/neteq/merge.cc
diff --git a/webrtc/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/merge.h
rename to modules/audio_coding/neteq/merge.h
diff --git a/webrtc/modules/audio_coding/neteq/merge_unittest.cc b/modules/audio_coding/neteq/merge_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/merge_unittest.cc
rename to modules/audio_coding/neteq/merge_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
rename to modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h b/modules/audio_coding/neteq/mock/mock_decoder_database.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h
rename to modules/audio_coding/neteq/mock/mock_decoder_database.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h b/modules/audio_coding/neteq/mock/mock_delay_manager.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h
rename to modules/audio_coding/neteq/mock/mock_delay_manager.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
rename to modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
rename to modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
rename to modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_expand.h b/modules/audio_coding/neteq/mock/mock_expand.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_expand.h
rename to modules/audio_coding/neteq/mock/mock_expand.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
rename to modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/modules/audio_coding/neteq/mock/mock_packet_buffer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h
rename to modules/audio_coding/neteq/mock/mock_packet_buffer.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h b/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h
rename to modules/audio_coding/neteq/mock/mock_red_payload_splitter.h
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_statistics_calculator.h b/modules/audio_coding/neteq/mock/mock_statistics_calculator.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/mock/mock_statistics_calculator.h
rename to modules/audio_coding/neteq/mock/mock_statistics_calculator.h
diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker.cc b/modules/audio_coding/neteq/nack_tracker.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/nack_tracker.cc
rename to modules/audio_coding/neteq/nack_tracker.cc
diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker.h b/modules/audio_coding/neteq/nack_tracker.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/nack_tracker.h
rename to modules/audio_coding/neteq/nack_tracker.h
diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc b/modules/audio_coding/neteq/nack_tracker_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc
rename to modules/audio_coding/neteq/nack_tracker_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq.cc b/modules/audio_coding/neteq/neteq.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq.cc
rename to modules/audio_coding/neteq/neteq.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.cc b/modules/audio_coding/neteq/neteq_decoder_enum.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_decoder_enum.cc
rename to modules/audio_coding/neteq/neteq_decoder_enum.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h b/modules/audio_coding/neteq/neteq_decoder_enum.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h
rename to modules/audio_coding/neteq/neteq_decoder_enum.h
diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
rename to modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_impl.cc
rename to modules/audio_coding/neteq/neteq_impl.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_impl.h
rename to modules/audio_coding/neteq/neteq_impl.h
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
rename to modules/audio_coding/neteq/neteq_impl_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
rename to modules/audio_coding/neteq/neteq_network_stats_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
rename to modules/audio_coding/neteq/neteq_stereo_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_unittest.cc
rename to modules/audio_coding/neteq/neteq_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.proto b/modules/audio_coding/neteq/neteq_unittest.proto
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/neteq_unittest.proto
rename to modules/audio_coding/neteq/neteq_unittest.proto
diff --git a/webrtc/modules/audio_coding/neteq/normal.cc b/modules/audio_coding/neteq/normal.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/normal.cc
rename to modules/audio_coding/neteq/normal.cc
diff --git a/webrtc/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/normal.h
rename to modules/audio_coding/neteq/normal.h
diff --git a/webrtc/modules/audio_coding/neteq/normal_unittest.cc b/modules/audio_coding/neteq/normal_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/normal_unittest.cc
rename to modules/audio_coding/neteq/normal_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/packet.cc b/modules/audio_coding/neteq/packet.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/packet.cc
rename to modules/audio_coding/neteq/packet.cc
diff --git a/webrtc/modules/audio_coding/neteq/packet.h b/modules/audio_coding/neteq/packet.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/packet.h
rename to modules/audio_coding/neteq/packet.h
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.cc b/modules/audio_coding/neteq/packet_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/packet_buffer.cc
rename to modules/audio_coding/neteq/packet_buffer.cc
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/packet_buffer.h
rename to modules/audio_coding/neteq/packet_buffer.h
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
rename to modules/audio_coding/neteq/packet_buffer_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad.cc b/modules/audio_coding/neteq/post_decode_vad.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/post_decode_vad.cc
rename to modules/audio_coding/neteq/post_decode_vad.cc
diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/post_decode_vad.h
rename to modules/audio_coding/neteq/post_decode_vad.h
diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/modules/audio_coding/neteq/post_decode_vad_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc
rename to modules/audio_coding/neteq/post_decode_vad_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.cc b/modules/audio_coding/neteq/preemptive_expand.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/preemptive_expand.cc
rename to modules/audio_coding/neteq/preemptive_expand.cc
diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/preemptive_expand.h
rename to modules/audio_coding/neteq/preemptive_expand.h
diff --git a/webrtc/modules/audio_coding/neteq/random_vector.cc b/modules/audio_coding/neteq/random_vector.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/random_vector.cc
rename to modules/audio_coding/neteq/random_vector.cc
diff --git a/webrtc/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq/random_vector.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/random_vector.h
rename to modules/audio_coding/neteq/random_vector.h
diff --git a/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc b/modules/audio_coding/neteq/random_vector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/random_vector_unittest.cc
rename to modules/audio_coding/neteq/random_vector_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter.cc b/modules/audio_coding/neteq/red_payload_splitter.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/red_payload_splitter.cc
rename to modules/audio_coding/neteq/red_payload_splitter.cc
diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter.h b/modules/audio_coding/neteq/red_payload_splitter.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/red_payload_splitter.h
rename to modules/audio_coding/neteq/red_payload_splitter.h
diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
rename to modules/audio_coding/neteq/red_payload_splitter_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/rtcp.cc b/modules/audio_coding/neteq/rtcp.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/rtcp.cc
rename to modules/audio_coding/neteq/rtcp.cc
diff --git a/webrtc/modules/audio_coding/neteq/rtcp.h b/modules/audio_coding/neteq/rtcp.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/rtcp.h
rename to modules/audio_coding/neteq/rtcp.h
diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/statistics_calculator.cc
rename to modules/audio_coding/neteq/statistics_calculator.cc
diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/statistics_calculator.h
rename to modules/audio_coding/neteq/statistics_calculator.h
diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.cc b/modules/audio_coding/neteq/sync_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/sync_buffer.cc
rename to modules/audio_coding/neteq/sync_buffer.cc
diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/sync_buffer.h
rename to modules/audio_coding/neteq/sync_buffer.h
diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc b/modules/audio_coding/neteq/sync_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc
rename to modules/audio_coding/neteq/sync_buffer_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
rename to modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
rename to modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
diff --git a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
rename to modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
rename to modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
diff --git a/webrtc/modules/audio_coding/neteq/test/PayloadTypes.h b/modules/audio_coding/neteq/test/PayloadTypes.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/PayloadTypes.h
rename to modules/audio_coding/neteq/test/PayloadTypes.h
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPchange.cc b/modules/audio_coding/neteq/test/RTPchange.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/RTPchange.cc
rename to modules/audio_coding/neteq/test/RTPchange.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/modules/audio_coding/neteq/test/RTPencode.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/RTPencode.cc
rename to modules/audio_coding/neteq/test/RTPencode.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc b/modules/audio_coding/neteq/test/RTPjitter.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/RTPjitter.cc
rename to modules/audio_coding/neteq/test/RTPjitter.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc b/modules/audio_coding/neteq/test/RTPtimeshift.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc
rename to modules/audio_coding/neteq/test/RTPtimeshift.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m b/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
rename to modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
diff --git a/webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m b/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
rename to modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
rename to modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc b/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
rename to modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc b/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc
rename to modules/audio_coding/neteq/test/neteq_opus_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
rename to modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
rename to modules/audio_coding/neteq/test/neteq_performance_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc b/modules/audio_coding/neteq/test/neteq_speed_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc
rename to modules/audio_coding/neteq/test/neteq_speed_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tick_timer.cc b/modules/audio_coding/neteq/tick_timer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tick_timer.cc
rename to modules/audio_coding/neteq/tick_timer.cc
diff --git a/webrtc/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tick_timer.h
rename to modules/audio_coding/neteq/tick_timer.h
diff --git a/webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc b/modules/audio_coding/neteq/tick_timer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc
rename to modules/audio_coding/neteq/tick_timer_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.cc b/modules/audio_coding/neteq/time_stretch.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/time_stretch.cc
rename to modules/audio_coding/neteq/time_stretch.cc
diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/time_stretch.h
rename to modules/audio_coding/neteq/time_stretch.h
diff --git a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc
rename to modules/audio_coding/neteq/time_stretch_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc b/modules/audio_coding/neteq/timestamp_scaler.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
rename to modules/audio_coding/neteq/timestamp_scaler.cc
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/timestamp_scaler.h
rename to modules/audio_coding/neteq/timestamp_scaler.h
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
rename to modules/audio_coding/neteq/timestamp_scaler_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/DEPS b/modules/audio_coding/neteq/tools/DEPS
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/DEPS
rename to modules/audio_coding/neteq/tools/DEPS
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h b/modules/audio_coding/neteq/tools/audio_checksum.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/audio_checksum.h
rename to modules/audio_coding/neteq/tools/audio_checksum.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc b/modules/audio_coding/neteq/tools/audio_loop.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/audio_loop.cc
rename to modules/audio_coding/neteq/tools/audio_loop.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/audio_loop.h
rename to modules/audio_coding/neteq/tools/audio_loop.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_sink.cc b/modules/audio_coding/neteq/tools/audio_sink.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/audio_sink.cc
rename to modules/audio_coding/neteq/tools/audio_sink.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h b/modules/audio_coding/neteq/tools/audio_sink.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/audio_sink.h
rename to modules/audio_coding/neteq/tools/audio_sink.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc
rename to modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
rename to modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc b/modules/audio_coding/neteq/tools/encode_neteq_input.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc
rename to modules/audio_coding/neteq/tools/encode_neteq_input.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h b/modules/audio_coding/neteq/tools/encode_neteq_input.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h
rename to modules/audio_coding/neteq/tools/encode_neteq_input.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc b/modules/audio_coding/neteq/tools/fake_decode_from_file.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc
rename to modules/audio_coding/neteq/tools/fake_decode_from_file.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h b/modules/audio_coding/neteq/tools/fake_decode_from_file.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h
rename to modules/audio_coding/neteq/tools/fake_decode_from_file.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc b/modules/audio_coding/neteq/tools/input_audio_file.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc
rename to modules/audio_coding/neteq/tools/input_audio_file.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
rename to modules/audio_coding/neteq/tools/input_audio_file.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc
rename to modules/audio_coding/neteq/tools/input_audio_file_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc
rename to modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h
rename to modules/audio_coding/neteq/tools/neteq_delay_analyzer.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
rename to modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h
rename to modules/audio_coding/neteq/tools/neteq_external_decoder_test.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_input.cc b/modules/audio_coding/neteq/tools/neteq_input.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_input.cc
rename to modules/audio_coding/neteq/tools/neteq_input.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_input.h b/modules/audio_coding/neteq/tools/neteq_input.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_input.h
rename to modules/audio_coding/neteq/tools/neteq_input.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc b/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc
rename to modules/audio_coding/neteq/tools/neteq_packet_source_input.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.h b/modules/audio_coding/neteq/tools/neteq_packet_source_input.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.h
rename to modules/audio_coding/neteq/tools/neteq_packet_source_input.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
rename to modules/audio_coding/neteq/tools/neteq_performance_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h b/modules/audio_coding/neteq/tools/neteq_performance_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h
rename to modules/audio_coding/neteq/tools/neteq_performance_test.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
rename to modules/audio_coding/neteq/tools/neteq_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
rename to modules/audio_coding/neteq/tools/neteq_quality_test.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc b/modules/audio_coding/neteq/tools/neteq_replacement_input.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc
rename to modules/audio_coding/neteq/tools/neteq_replacement_input.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h b/modules/audio_coding/neteq/tools/neteq_replacement_input.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h
rename to modules/audio_coding/neteq/tools/neteq_replacement_input.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
rename to modules/audio_coding/neteq/tools/neteq_rtpplay.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_test.cc
rename to modules/audio_coding/neteq/tools/neteq_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_test.h b/modules/audio_coding/neteq/tools/neteq_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/neteq_test.h
rename to modules/audio_coding/neteq/tools/neteq_test.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h b/modules/audio_coding/neteq/tools/output_audio_file.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/output_audio_file.h
rename to modules/audio_coding/neteq/tools/output_audio_file.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h b/modules/audio_coding/neteq/tools/output_wav_file.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/output_wav_file.h
rename to modules/audio_coding/neteq/tools/output_wav_file.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.cc b/modules/audio_coding/neteq/tools/packet.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/packet.cc
rename to modules/audio_coding/neteq/tools/packet.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/packet.h
rename to modules/audio_coding/neteq/tools/packet.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_source.cc b/modules/audio_coding/neteq/tools/packet_source.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/packet_source.cc
rename to modules/audio_coding/neteq/tools/packet_source.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/packet_source.h
rename to modules/audio_coding/neteq/tools/packet_source.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc b/modules/audio_coding/neteq/tools/packet_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc
rename to modules/audio_coding/neteq/tools/packet_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc b/modules/audio_coding/neteq/tools/resample_input_audio_file.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc
rename to modules/audio_coding/neteq/tools/resample_input_audio_file.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/modules/audio_coding/neteq/tools/resample_input_audio_file.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h
rename to modules/audio_coding/neteq/tools/resample_input_audio_file.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc
rename to modules/audio_coding/neteq/tools/rtc_event_log_source.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/modules/audio_coding/neteq/tools/rtc_event_log_source.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h
rename to modules/audio_coding/neteq/tools/rtc_event_log_source.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc b/modules/audio_coding/neteq/tools/rtp_analyze.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc
rename to modules/audio_coding/neteq/tools/rtp_analyze.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc b/modules/audio_coding/neteq/tools/rtp_file_source.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc
rename to modules/audio_coding/neteq/tools/rtp_file_source.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h b/modules/audio_coding/neteq/tools/rtp_file_source.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
rename to modules/audio_coding/neteq/tools/rtp_file_source.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc b/modules/audio_coding/neteq/tools/rtp_generator.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc
rename to modules/audio_coding/neteq/tools/rtp_generator.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
rename to modules/audio_coding/neteq/tools/rtp_generator.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtpcat.cc b/modules/audio_coding/neteq/tools/rtpcat.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq/tools/rtpcat.cc
rename to modules/audio_coding/neteq/tools/rtpcat.cc
diff --git a/webrtc/modules/audio_coding/test/ACMTest.h b/modules/audio_coding/test/ACMTest.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/ACMTest.h
rename to modules/audio_coding/test/ACMTest.h
diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/modules/audio_coding/test/APITest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/APITest.cc
rename to modules/audio_coding/test/APITest.cc
diff --git a/webrtc/modules/audio_coding/test/APITest.h b/modules/audio_coding/test/APITest.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/APITest.h
rename to modules/audio_coding/test/APITest.h
diff --git a/webrtc/modules/audio_coding/test/Channel.cc b/modules/audio_coding/test/Channel.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/Channel.cc
rename to modules/audio_coding/test/Channel.cc
diff --git a/webrtc/modules/audio_coding/test/Channel.h b/modules/audio_coding/test/Channel.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/Channel.h
rename to modules/audio_coding/test/Channel.h
diff --git a/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/EncodeDecodeTest.cc
rename to modules/audio_coding/test/EncodeDecodeTest.cc
diff --git a/webrtc/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/EncodeDecodeTest.h
rename to modules/audio_coding/test/EncodeDecodeTest.h
diff --git a/webrtc/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/PCMFile.cc
rename to modules/audio_coding/test/PCMFile.cc
diff --git a/webrtc/modules/audio_coding/test/PCMFile.h b/modules/audio_coding/test/PCMFile.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/PCMFile.h
rename to modules/audio_coding/test/PCMFile.h
diff --git a/webrtc/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/PacketLossTest.cc
rename to modules/audio_coding/test/PacketLossTest.cc
diff --git a/webrtc/modules/audio_coding/test/PacketLossTest.h b/modules/audio_coding/test/PacketLossTest.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/PacketLossTest.h
rename to modules/audio_coding/test/PacketLossTest.h
diff --git a/webrtc/modules/audio_coding/test/RTPFile.cc b/modules/audio_coding/test/RTPFile.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/RTPFile.cc
rename to modules/audio_coding/test/RTPFile.cc
diff --git a/webrtc/modules/audio_coding/test/RTPFile.h b/modules/audio_coding/test/RTPFile.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/RTPFile.h
rename to modules/audio_coding/test/RTPFile.h
diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestAllCodecs.cc
rename to modules/audio_coding/test/TestAllCodecs.cc
diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.h b/modules/audio_coding/test/TestAllCodecs.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestAllCodecs.h
rename to modules/audio_coding/test/TestAllCodecs.h
diff --git a/webrtc/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestRedFec.cc
rename to modules/audio_coding/test/TestRedFec.cc
diff --git a/webrtc/modules/audio_coding/test/TestRedFec.h b/modules/audio_coding/test/TestRedFec.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestRedFec.h
rename to modules/audio_coding/test/TestRedFec.h
diff --git a/webrtc/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestStereo.cc
rename to modules/audio_coding/test/TestStereo.cc
diff --git a/webrtc/modules/audio_coding/test/TestStereo.h b/modules/audio_coding/test/TestStereo.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestStereo.h
rename to modules/audio_coding/test/TestStereo.h
diff --git a/webrtc/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestVADDTX.cc
rename to modules/audio_coding/test/TestVADDTX.cc
diff --git a/webrtc/modules/audio_coding/test/TestVADDTX.h b/modules/audio_coding/test/TestVADDTX.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/TestVADDTX.h
rename to modules/audio_coding/test/TestVADDTX.h
diff --git a/webrtc/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/Tester.cc
rename to modules/audio_coding/test/Tester.cc
diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/TwoWayCommunication.cc
rename to modules/audio_coding/test/TwoWayCommunication.cc
diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.h b/modules/audio_coding/test/TwoWayCommunication.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/TwoWayCommunication.h
rename to modules/audio_coding/test/TwoWayCommunication.h
diff --git a/webrtc/modules/audio_coding/test/delay_test.cc b/modules/audio_coding/test/delay_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/delay_test.cc
rename to modules/audio_coding/test/delay_test.cc
diff --git a/webrtc/modules/audio_coding/test/iSACTest.cc b/modules/audio_coding/test/iSACTest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/iSACTest.cc
rename to modules/audio_coding/test/iSACTest.cc
diff --git a/webrtc/modules/audio_coding/test/iSACTest.h b/modules/audio_coding/test/iSACTest.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/iSACTest.h
rename to modules/audio_coding/test/iSACTest.h
diff --git a/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/insert_packet_with_timing.cc
rename to modules/audio_coding/test/insert_packet_with_timing.cc
diff --git a/webrtc/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/opus_test.cc
rename to modules/audio_coding/test/opus_test.cc
diff --git a/webrtc/modules/audio_coding/test/opus_test.h b/modules/audio_coding/test/opus_test.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/opus_test.h
rename to modules/audio_coding/test/opus_test.h
diff --git a/webrtc/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/target_delay_unittest.cc
rename to modules/audio_coding/test/target_delay_unittest.cc
diff --git a/webrtc/modules/audio_coding/test/utility.cc b/modules/audio_coding/test/utility.cc
similarity index 100%
rename from webrtc/modules/audio_coding/test/utility.cc
rename to modules/audio_coding/test/utility.cc
diff --git a/webrtc/modules/audio_coding/test/utility.h b/modules/audio_coding/test/utility.h
similarity index 100%
rename from webrtc/modules/audio_coding/test/utility.h
rename to modules/audio_coding/test/utility.h
diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/modules/audio_conference_mixer/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/BUILD.gn
rename to modules/audio_conference_mixer/BUILD.gn
diff --git a/webrtc/modules/audio_conference_mixer/DEPS b/modules/audio_conference_mixer/DEPS
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/DEPS
rename to modules/audio_conference_mixer/DEPS
diff --git a/webrtc/modules/audio_conference_mixer/OWNERS b/modules/audio_conference_mixer/OWNERS
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/OWNERS
rename to modules/audio_conference_mixer/OWNERS
diff --git a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h b/modules/audio_conference_mixer/include/audio_conference_mixer.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
rename to modules/audio_conference_mixer/include/audio_conference_mixer.h
diff --git a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h b/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h
rename to modules/audio_conference_mixer/include/audio_conference_mixer_defines.h
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
rename to modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
rename to modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc b/modules/audio_conference_mixer/source/audio_frame_manipulator.cc
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc
rename to modules/audio_conference_mixer/source/audio_frame_manipulator.cc
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h b/modules/audio_conference_mixer/source/audio_frame_manipulator.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h
rename to modules/audio_conference_mixer/source/audio_frame_manipulator.h
diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool.h b/modules/audio_conference_mixer/source/memory_pool.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/memory_pool.h
rename to modules/audio_conference_mixer/source/memory_pool.h
diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h b/modules/audio_conference_mixer/source/memory_pool_posix.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h
rename to modules/audio_conference_mixer/source/memory_pool_posix.h
diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h b/modules/audio_conference_mixer/source/memory_pool_win.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/memory_pool_win.h
rename to modules/audio_conference_mixer/source/memory_pool_win.h
diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc b/modules/audio_conference_mixer/source/time_scheduler.cc
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/time_scheduler.cc
rename to modules/audio_conference_mixer/source/time_scheduler.cc
diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h b/modules/audio_conference_mixer/source/time_scheduler.h
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/source/time_scheduler.h
rename to modules/audio_conference_mixer/source/time_scheduler.h
diff --git a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
rename to modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
diff --git a/webrtc/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_device/BUILD.gn
rename to modules/audio_device/BUILD.gn
diff --git a/webrtc/modules/audio_device/DEPS b/modules/audio_device/DEPS
similarity index 100%
rename from webrtc/modules/audio_device/DEPS
rename to modules/audio_device/DEPS
diff --git a/webrtc/modules/audio_device/OWNERS b/modules/audio_device/OWNERS
similarity index 100%
rename from webrtc/modules/audio_device/OWNERS
rename to modules/audio_device/OWNERS
diff --git a/webrtc/modules/audio_device/android/audio_common.h b/modules/audio_device/android/audio_common.h
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_common.h
rename to modules/audio_device/android/audio_common.h
diff --git a/webrtc/modules/audio_device/android/audio_device_template.h b/modules/audio_device/android/audio_device_template.h
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_device_template.h
rename to modules/audio_device/android/audio_device_template.h
diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_device_unittest.cc
rename to modules/audio_device/android/audio_device_unittest.cc
diff --git a/webrtc/modules/audio_device/android/audio_manager.cc b/modules/audio_device/android/audio_manager.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_manager.cc
rename to modules/audio_device/android/audio_manager.cc
diff --git a/webrtc/modules/audio_device/android/audio_manager.h b/modules/audio_device/android/audio_manager.h
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_manager.h
rename to modules/audio_device/android/audio_manager.h
diff --git a/webrtc/modules/audio_device/android/audio_manager_unittest.cc b/modules/audio_device/android/audio_manager_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_manager_unittest.cc
rename to modules/audio_device/android/audio_manager_unittest.cc
diff --git a/webrtc/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_record_jni.cc
rename to modules/audio_device/android/audio_record_jni.cc
diff --git a/webrtc/modules/audio_device/android/audio_record_jni.h b/modules/audio_device/android/audio_record_jni.h
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_record_jni.h
rename to modules/audio_device/android/audio_record_jni.h
diff --git a/webrtc/modules/audio_device/android/audio_track_jni.cc b/modules/audio_device/android/audio_track_jni.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_track_jni.cc
rename to modules/audio_device/android/audio_track_jni.cc
diff --git a/webrtc/modules/audio_device/android/audio_track_jni.h b/modules/audio_device/android/audio_track_jni.h
similarity index 100%
rename from webrtc/modules/audio_device/android/audio_track_jni.h
rename to modules/audio_device/android/audio_track_jni.h
diff --git a/webrtc/modules/audio_device/android/build_info.cc b/modules/audio_device/android/build_info.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/build_info.cc
rename to modules/audio_device/android/build_info.cc
diff --git a/webrtc/modules/audio_device/android/build_info.h b/modules/audio_device/android/build_info.h
similarity index 100%
rename from webrtc/modules/audio_device/android/build_info.h
rename to modules/audio_device/android/build_info.h
diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/modules/audio_device/android/ensure_initialized.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/ensure_initialized.cc
rename to modules/audio_device/android/ensure_initialized.cc
diff --git a/webrtc/modules/audio_device/android/ensure_initialized.h b/modules/audio_device/android/ensure_initialized.h
similarity index 100%
rename from webrtc/modules/audio_device/android/ensure_initialized.h
rename to modules/audio_device/android/ensure_initialized.h
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
rename to modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
diff --git a/webrtc/modules/audio_device/android/opensles_common.cc b/modules/audio_device/android/opensles_common.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_common.cc
rename to modules/audio_device/android/opensles_common.cc
diff --git a/webrtc/modules/audio_device/android/opensles_common.h b/modules/audio_device/android/opensles_common.h
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_common.h
rename to modules/audio_device/android/opensles_common.h
diff --git a/webrtc/modules/audio_device/android/opensles_player.cc b/modules/audio_device/android/opensles_player.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_player.cc
rename to modules/audio_device/android/opensles_player.cc
diff --git a/webrtc/modules/audio_device/android/opensles_player.h b/modules/audio_device/android/opensles_player.h
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_player.h
rename to modules/audio_device/android/opensles_player.h
diff --git a/webrtc/modules/audio_device/android/opensles_recorder.cc b/modules/audio_device/android/opensles_recorder.cc
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_recorder.cc
rename to modules/audio_device/android/opensles_recorder.cc
diff --git a/webrtc/modules/audio_device/android/opensles_recorder.h b/modules/audio_device/android/opensles_recorder.h
similarity index 100%
rename from webrtc/modules/audio_device/android/opensles_recorder.h
rename to modules/audio_device/android/opensles_recorder.h
diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/modules/audio_device/audio_device_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_buffer.cc
rename to modules/audio_device/audio_device_buffer.cc
diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_buffer.h
rename to modules/audio_device/audio_device_buffer.h
diff --git a/webrtc/modules/audio_device/audio_device_config.h b/modules/audio_device/audio_device_config.h
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_config.h
rename to modules/audio_device/audio_device_config.h
diff --git a/webrtc/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_data_observer.cc
rename to modules/audio_device/audio_device_data_observer.cc
diff --git a/webrtc/modules/audio_device/audio_device_generic.cc b/modules/audio_device/audio_device_generic.cc
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_generic.cc
rename to modules/audio_device/audio_device_generic.cc
diff --git a/webrtc/modules/audio_device/audio_device_generic.h b/modules/audio_device/audio_device_generic.h
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_generic.h
rename to modules/audio_device/audio_device_generic.h
diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_impl.cc
rename to modules/audio_device/audio_device_impl.cc
diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_impl.h
rename to modules/audio_device/audio_device_impl.h
diff --git a/webrtc/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_device/audio_device_unittest.cc
rename to modules/audio_device/audio_device_unittest.cc
diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.cc b/modules/audio_device/dummy/audio_device_dummy.cc
similarity index 100%
rename from webrtc/modules/audio_device/dummy/audio_device_dummy.cc
rename to modules/audio_device/dummy/audio_device_dummy.cc
diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.h b/modules/audio_device/dummy/audio_device_dummy.h
similarity index 100%
rename from webrtc/modules/audio_device/dummy/audio_device_dummy.h
rename to modules/audio_device/dummy/audio_device_dummy.h
diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc
similarity index 100%
rename from webrtc/modules/audio_device/dummy/file_audio_device.cc
rename to modules/audio_device/dummy/file_audio_device.cc
diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h
similarity index 100%
rename from webrtc/modules/audio_device/dummy/file_audio_device.h
rename to modules/audio_device/dummy/file_audio_device.h
diff --git a/webrtc/modules/audio_device/dummy/file_audio_device_factory.cc b/modules/audio_device/dummy/file_audio_device_factory.cc
similarity index 100%
rename from webrtc/modules/audio_device/dummy/file_audio_device_factory.cc
rename to modules/audio_device/dummy/file_audio_device_factory.cc
diff --git a/webrtc/modules/audio_device/dummy/file_audio_device_factory.h b/modules/audio_device/dummy/file_audio_device_factory.h
similarity index 100%
rename from webrtc/modules/audio_device/dummy/file_audio_device_factory.h
rename to modules/audio_device/dummy/file_audio_device_factory.h
diff --git a/webrtc/modules/audio_device/fine_audio_buffer.cc b/modules/audio_device/fine_audio_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_device/fine_audio_buffer.cc
rename to modules/audio_device/fine_audio_buffer.cc
diff --git a/webrtc/modules/audio_device/fine_audio_buffer.h b/modules/audio_device/fine_audio_buffer.h
similarity index 100%
rename from webrtc/modules/audio_device/fine_audio_buffer.h
rename to modules/audio_device/fine_audio_buffer.h
diff --git a/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc b/modules/audio_device/fine_audio_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_device/fine_audio_buffer_unittest.cc
rename to modules/audio_device/fine_audio_buffer_unittest.cc
diff --git a/webrtc/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h
similarity index 100%
rename from webrtc/modules/audio_device/include/audio_device.h
rename to modules/audio_device/include/audio_device.h
diff --git a/webrtc/modules/audio_device/include/audio_device_data_observer.h b/modules/audio_device/include/audio_device_data_observer.h
similarity index 100%
rename from webrtc/modules/audio_device/include/audio_device_data_observer.h
rename to modules/audio_device/include/audio_device_data_observer.h
diff --git a/webrtc/modules/audio_device/include/audio_device_defines.h b/modules/audio_device/include/audio_device_defines.h
similarity index 100%
rename from webrtc/modules/audio_device/include/audio_device_defines.h
rename to modules/audio_device/include/audio_device_defines.h
diff --git a/webrtc/modules/audio_device/include/fake_audio_device.h b/modules/audio_device/include/fake_audio_device.h
similarity index 100%
rename from webrtc/modules/audio_device/include/fake_audio_device.h
rename to modules/audio_device/include/fake_audio_device.h
diff --git a/webrtc/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h
similarity index 100%
rename from webrtc/modules/audio_device/include/mock_audio_device.h
rename to modules/audio_device/include/mock_audio_device.h
diff --git a/webrtc/modules/audio_device/include/mock_audio_transport.h b/modules/audio_device/include/mock_audio_transport.h
similarity index 100%
rename from webrtc/modules/audio_device/include/mock_audio_transport.h
rename to modules/audio_device/include/mock_audio_transport.h
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/modules/audio_device/ios/audio_device_ios.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/audio_device_ios.h
rename to modules/audio_device/ios/audio_device_ios.h
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm
similarity index 100%
rename from webrtc/modules/audio_device/ios/audio_device_ios.mm
rename to modules/audio_device/ios/audio_device_ios.mm
diff --git a/webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm b/modules/audio_device/ios/audio_device_not_implemented_ios.mm
similarity index 100%
rename from webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm
rename to modules/audio_device/ios/audio_device_not_implemented_ios.mm
diff --git a/webrtc/modules/audio_device/ios/audio_device_unittest_ios.mm b/modules/audio_device/ios/audio_device_unittest_ios.mm
similarity index 100%
rename from webrtc/modules/audio_device/ios/audio_device_unittest_ios.mm
rename to modules/audio_device/ios/audio_device_unittest_ios.mm
diff --git a/webrtc/modules/audio_device/ios/audio_session_observer.h b/modules/audio_device/ios/audio_session_observer.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/audio_session_observer.h
rename to modules/audio_device/ios/audio_session_observer.h
diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h b/modules/audio_device/ios/objc/RTCAudioSession.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/objc/RTCAudioSession.h
rename to modules/audio_device/ios/objc/RTCAudioSession.h
diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h b/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h
rename to modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h
diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h
rename to modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h
diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm
similarity index 100%
rename from webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm
rename to modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm
diff --git a/webrtc/modules/audio_device/ios/voice_processing_audio_unit.h b/modules/audio_device/ios/voice_processing_audio_unit.h
similarity index 100%
rename from webrtc/modules/audio_device/ios/voice_processing_audio_unit.h
rename to modules/audio_device/ios/voice_processing_audio_unit.h
diff --git a/webrtc/modules/audio_device/ios/voice_processing_audio_unit.mm b/modules/audio_device/ios/voice_processing_audio_unit.mm
similarity index 100%
rename from webrtc/modules/audio_device/ios/voice_processing_audio_unit.mm
rename to modules/audio_device/ios/voice_processing_audio_unit.mm
diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc b/modules/audio_device/linux/alsasymboltable_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
rename to modules/audio_device/linux/alsasymboltable_linux.cc
diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.h b/modules/audio_device/linux/alsasymboltable_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/alsasymboltable_linux.h
rename to modules/audio_device/linux/alsasymboltable_linux.h
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
rename to modules/audio_device/linux/audio_device_alsa_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_device_alsa_linux.h
rename to modules/audio_device/linux/audio_device_alsa_linux.h
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/modules/audio_device/linux/audio_device_pulse_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
rename to modules/audio_device/linux/audio_device_pulse_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
rename to modules/audio_device/linux/audio_device_pulse_linux.h
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
rename to modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
rename to modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
rename to modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
rename to modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/modules/audio_device/linux/latebindingsymboltable_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
rename to modules/audio_device/linux/latebindingsymboltable_linux.cc
diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/modules/audio_device/linux/latebindingsymboltable_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
rename to modules/audio_device/linux/latebindingsymboltable_linux.h
diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
similarity index 100%
rename from webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
rename to modules/audio_device/linux/pulseaudiosymboltable_linux.cc
diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h b/modules/audio_device/linux/pulseaudiosymboltable_linux.h
similarity index 100%
rename from webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h
rename to modules/audio_device/linux/pulseaudiosymboltable_linux.h
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc
similarity index 100%
rename from webrtc/modules/audio_device/mac/audio_device_mac.cc
rename to modules/audio_device/mac/audio_device_mac.cc
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h
similarity index 100%
rename from webrtc/modules/audio_device/mac/audio_device_mac.h
rename to modules/audio_device/mac/audio_device_mac.h
diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc b/modules/audio_device/mac/audio_mixer_manager_mac.cc
similarity index 100%
rename from webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
rename to modules/audio_device/mac/audio_mixer_manager_mac.cc
diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h
similarity index 100%
rename from webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
rename to modules/audio_device/mac/audio_mixer_manager_mac.h
diff --git a/webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h b/modules/audio_device/mac/portaudio/pa_memorybarrier.h
similarity index 100%
rename from webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h
rename to modules/audio_device/mac/portaudio/pa_memorybarrier.h
diff --git a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c b/modules/audio_device/mac/portaudio/pa_ringbuffer.c
similarity index 100%
rename from webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c
rename to modules/audio_device/mac/portaudio/pa_ringbuffer.c
diff --git a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h b/modules/audio_device/mac/portaudio/pa_ringbuffer.h
similarity index 100%
rename from webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h
rename to modules/audio_device/mac/portaudio/pa_ringbuffer.h
diff --git a/webrtc/modules/audio_device/mock_audio_device_buffer.h b/modules/audio_device/mock_audio_device_buffer.h
similarity index 100%
rename from webrtc/modules/audio_device/mock_audio_device_buffer.h
rename to modules/audio_device/mock_audio_device_buffer.h
diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc
similarity index 100%
rename from webrtc/modules/audio_device/win/audio_device_core_win.cc
rename to modules/audio_device/win/audio_device_core_win.cc
diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h
similarity index 100%
rename from webrtc/modules/audio_device/win/audio_device_core_win.h
rename to modules/audio_device/win/audio_device_core_win.h
diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_mixer/BUILD.gn
rename to modules/audio_mixer/BUILD.gn
diff --git a/webrtc/modules/audio_mixer/DEPS b/modules/audio_mixer/DEPS
similarity index 100%
rename from webrtc/modules/audio_mixer/DEPS
rename to modules/audio_mixer/DEPS
diff --git a/webrtc/modules/audio_mixer/OWNERS b/modules/audio_mixer/OWNERS
similarity index 100%
rename from webrtc/modules/audio_mixer/OWNERS
rename to modules/audio_mixer/OWNERS
diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator.cc b/modules/audio_mixer/audio_frame_manipulator.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_frame_manipulator.cc
rename to modules/audio_mixer/audio_frame_manipulator.cc
diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator.h b/modules/audio_mixer/audio_frame_manipulator.h
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_frame_manipulator.h
rename to modules/audio_mixer/audio_frame_manipulator.h
diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator_unittest.cc b/modules/audio_mixer/audio_frame_manipulator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_frame_manipulator_unittest.cc
rename to modules/audio_mixer/audio_frame_manipulator_unittest.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_mixer_impl.cc
rename to modules/audio_mixer/audio_mixer_impl.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_mixer_impl.h
rename to modules/audio_mixer/audio_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc b/modules/audio_mixer/audio_mixer_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
rename to modules/audio_mixer/audio_mixer_impl_unittest.cc
diff --git a/webrtc/modules/audio_mixer/default_output_rate_calculator.cc b/modules/audio_mixer/default_output_rate_calculator.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/default_output_rate_calculator.cc
rename to modules/audio_mixer/default_output_rate_calculator.cc
diff --git a/webrtc/modules/audio_mixer/default_output_rate_calculator.h b/modules/audio_mixer/default_output_rate_calculator.h
similarity index 100%
rename from webrtc/modules/audio_mixer/default_output_rate_calculator.h
rename to modules/audio_mixer/default_output_rate_calculator.h
diff --git a/webrtc/modules/audio_mixer/frame_combiner.cc b/modules/audio_mixer/frame_combiner.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/frame_combiner.cc
rename to modules/audio_mixer/frame_combiner.cc
diff --git a/webrtc/modules/audio_mixer/frame_combiner.h b/modules/audio_mixer/frame_combiner.h
similarity index 100%
rename from webrtc/modules/audio_mixer/frame_combiner.h
rename to modules/audio_mixer/frame_combiner.h
diff --git a/webrtc/modules/audio_mixer/frame_combiner_unittest.cc b/modules/audio_mixer/frame_combiner_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/frame_combiner_unittest.cc
rename to modules/audio_mixer/frame_combiner_unittest.cc
diff --git a/webrtc/modules/audio_mixer/gain_change_calculator.cc b/modules/audio_mixer/gain_change_calculator.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/gain_change_calculator.cc
rename to modules/audio_mixer/gain_change_calculator.cc
diff --git a/webrtc/modules/audio_mixer/gain_change_calculator.h b/modules/audio_mixer/gain_change_calculator.h
similarity index 100%
rename from webrtc/modules/audio_mixer/gain_change_calculator.h
rename to modules/audio_mixer/gain_change_calculator.h
diff --git a/webrtc/modules/audio_mixer/output_rate_calculator.h b/modules/audio_mixer/output_rate_calculator.h
similarity index 100%
rename from webrtc/modules/audio_mixer/output_rate_calculator.h
rename to modules/audio_mixer/output_rate_calculator.h
diff --git a/webrtc/modules/audio_mixer/sine_wave_generator.cc b/modules/audio_mixer/sine_wave_generator.cc
similarity index 100%
rename from webrtc/modules/audio_mixer/sine_wave_generator.cc
rename to modules/audio_mixer/sine_wave_generator.cc
diff --git a/webrtc/modules/audio_mixer/sine_wave_generator.h b/modules/audio_mixer/sine_wave_generator.h
similarity index 100%
rename from webrtc/modules/audio_mixer/sine_wave_generator.h
rename to modules/audio_mixer/sine_wave_generator.h
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_processing/BUILD.gn
rename to modules/audio_processing/BUILD.gn
diff --git a/webrtc/modules/audio_processing/DEPS b/modules/audio_processing/DEPS
similarity index 100%
rename from webrtc/modules/audio_processing/DEPS
rename to modules/audio_processing/DEPS
diff --git a/webrtc/modules/audio_processing/OWNERS b/modules/audio_processing/OWNERS
similarity index 100%
rename from webrtc/modules/audio_processing/OWNERS
rename to modules/audio_processing/OWNERS
diff --git a/webrtc/modules/audio_processing/aec/aec_common.h b/modules/audio_processing/aec/aec_common.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_common.h
rename to modules/audio_processing/aec/aec_common.h
diff --git a/webrtc/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core.cc
rename to modules/audio_processing/aec/aec_core.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core.h
rename to modules/audio_processing/aec/aec_core.h
diff --git a/webrtc/modules/audio_processing/aec/aec_core_mips.cc b/modules/audio_processing/aec/aec_core_mips.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core_mips.cc
rename to modules/audio_processing/aec/aec_core_mips.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_core_neon.cc b/modules/audio_processing/aec/aec_core_neon.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core_neon.cc
rename to modules/audio_processing/aec/aec_core_neon.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h b/modules/audio_processing/aec/aec_core_optimized_methods.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h
rename to modules/audio_processing/aec/aec_core_optimized_methods.h
diff --git a/webrtc/modules/audio_processing/aec/aec_core_sse2.cc b/modules/audio_processing/aec/aec_core_sse2.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_core_sse2.cc
rename to modules/audio_processing/aec/aec_core_sse2.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_resampler.cc b/modules/audio_processing/aec/aec_resampler.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_resampler.cc
rename to modules/audio_processing/aec/aec_resampler.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_resampler.h b/modules/audio_processing/aec/aec_resampler.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec/aec_resampler.h
rename to modules/audio_processing/aec/aec_resampler.h
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.cc b/modules/audio_processing/aec/echo_cancellation.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/echo_cancellation.cc
rename to modules/audio_processing/aec/echo_cancellation.cc
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.h b/modules/audio_processing/aec/echo_cancellation.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec/echo_cancellation.h
rename to modules/audio_processing/aec/echo_cancellation.h
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/modules/audio_processing/aec/echo_cancellation_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc
rename to modules/audio_processing/aec/echo_cancellation_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec/system_delay_unittest.cc
rename to modules/audio_processing/aec/system_delay_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc b/modules/audio_processing/aec3/adaptive_fir_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc
rename to modules/audio_processing/aec3/adaptive_fir_filter.cc
diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h
rename to modules/audio_processing/aec3/adaptive_fir_filter.h
diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc
rename to modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/aec3_common.cc b/modules/audio_processing/aec3/aec3_common.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec3_common.cc
rename to modules/audio_processing/aec3/aec3_common.cc
diff --git a/webrtc/modules/audio_processing/aec3/aec3_common.h b/modules/audio_processing/aec3/aec3_common.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec3_common.h
rename to modules/audio_processing/aec3/aec3_common.h
diff --git a/webrtc/modules/audio_processing/aec3/aec3_fft.cc b/modules/audio_processing/aec3/aec3_fft.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec3_fft.cc
rename to modules/audio_processing/aec3/aec3_fft.cc
diff --git a/webrtc/modules/audio_processing/aec3/aec3_fft.h b/modules/audio_processing/aec3/aec3_fft.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec3_fft.h
rename to modules/audio_processing/aec3/aec3_fft.h
diff --git a/webrtc/modules/audio_processing/aec3/aec3_fft_unittest.cc b/modules/audio_processing/aec3/aec3_fft_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec3_fft_unittest.cc
rename to modules/audio_processing/aec3/aec3_fft_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec_state.cc
rename to modules/audio_processing/aec3/aec_state.cc
diff --git a/webrtc/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec_state.h
rename to modules/audio_processing/aec3/aec_state.h
diff --git a/webrtc/modules/audio_processing/aec3/aec_state_unittest.cc b/modules/audio_processing/aec3/aec_state_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/aec_state_unittest.cc
rename to modules/audio_processing/aec3/aec_state_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_framer.cc b/modules/audio_processing/aec3/block_framer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_framer.cc
rename to modules/audio_processing/aec3/block_framer.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_framer.h b/modules/audio_processing/aec3/block_framer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_framer.h
rename to modules/audio_processing/aec3/block_framer.h
diff --git a/webrtc/modules/audio_processing/aec3/block_framer_unittest.cc b/modules/audio_processing/aec3/block_framer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_framer_unittest.cc
rename to modules/audio_processing/aec3/block_framer_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor.cc
rename to modules/audio_processing/aec3/block_processor.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor.h b/modules/audio_processing/aec3/block_processor.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor.h
rename to modules/audio_processing/aec3/block_processor.h
diff --git a/webrtc/modules/audio_processing/aec3/block_processor_metrics.cc b/modules/audio_processing/aec3/block_processor_metrics.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor_metrics.cc
rename to modules/audio_processing/aec3/block_processor_metrics.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor_metrics.h b/modules/audio_processing/aec3/block_processor_metrics.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor_metrics.h
rename to modules/audio_processing/aec3/block_processor_metrics.h
diff --git a/webrtc/modules/audio_processing/aec3/block_processor_metrics_unittest.cc b/modules/audio_processing/aec3/block_processor_metrics_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor_metrics_unittest.cc
rename to modules/audio_processing/aec3/block_processor_metrics_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc b/modules/audio_processing/aec3/block_processor_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/block_processor_unittest.cc
rename to modules/audio_processing/aec3/block_processor_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc b/modules/audio_processing/aec3/cascaded_biquad_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc
rename to modules/audio_processing/aec3/cascaded_biquad_filter.cc
diff --git a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h b/modules/audio_processing/aec3/cascaded_biquad_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h
rename to modules/audio_processing/aec3/cascaded_biquad_filter.h
diff --git a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc b/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc
rename to modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/comfort_noise_generator.cc b/modules/audio_processing/aec3/comfort_noise_generator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/comfort_noise_generator.cc
rename to modules/audio_processing/aec3/comfort_noise_generator.cc
diff --git a/webrtc/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/comfort_noise_generator.h
rename to modules/audio_processing/aec3/comfort_noise_generator.h
diff --git a/webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc b/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc
rename to modules/audio_processing/aec3/comfort_noise_generator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/decimator_by_4.cc b/modules/audio_processing/aec3/decimator_by_4.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/decimator_by_4.cc
rename to modules/audio_processing/aec3/decimator_by_4.cc
diff --git a/webrtc/modules/audio_processing/aec3/decimator_by_4.h b/modules/audio_processing/aec3/decimator_by_4.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/decimator_by_4.h
rename to modules/audio_processing/aec3/decimator_by_4.h
diff --git a/webrtc/modules/audio_processing/aec3/decimator_by_4_unittest.cc b/modules/audio_processing/aec3/decimator_by_4_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/decimator_by_4_unittest.cc
rename to modules/audio_processing/aec3/decimator_by_4_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/downsampled_render_buffer.cc b/modules/audio_processing/aec3/downsampled_render_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/downsampled_render_buffer.cc
rename to modules/audio_processing/aec3/downsampled_render_buffer.cc
diff --git a/webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h b/modules/audio_processing/aec3/downsampled_render_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h
rename to modules/audio_processing/aec3/downsampled_render_buffer.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_canceller3.cc
rename to modules/audio_processing/aec3/echo_canceller3.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.h b/modules/audio_processing/aec3/echo_canceller3.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_canceller3.h
rename to modules/audio_processing/aec3/echo_canceller3.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc b/modules/audio_processing/aec3/echo_canceller3_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc
rename to modules/audio_processing/aec3/echo_canceller3_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc b/modules/audio_processing/aec3/echo_path_delay_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc
rename to modules/audio_processing/aec3/echo_path_delay_estimator.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h b/modules/audio_processing/aec3/echo_path_delay_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h
rename to modules/audio_processing/aec3/echo_path_delay_estimator.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc b/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc
rename to modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_variability.cc b/modules/audio_processing/aec3/echo_path_variability.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_variability.cc
rename to modules/audio_processing/aec3/echo_path_variability.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_variability.h b/modules/audio_processing/aec3/echo_path_variability.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_variability.h
rename to modules/audio_processing/aec3/echo_path_variability.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_path_variability_unittest.cc b/modules/audio_processing/aec3/echo_path_variability_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_path_variability_unittest.cc
rename to modules/audio_processing/aec3/echo_path_variability_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover.cc
rename to modules/audio_processing/aec3/echo_remover.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.h b/modules/audio_processing/aec3/echo_remover.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover.h
rename to modules/audio_processing/aec3/echo_remover.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc b/modules/audio_processing/aec3/echo_remover_metrics.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc
rename to modules/audio_processing/aec3/echo_remover_metrics.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h b/modules/audio_processing/aec3/echo_remover_metrics.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover_metrics.h
rename to modules/audio_processing/aec3/echo_remover_metrics.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc b/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc
rename to modules/audio_processing/aec3/echo_remover_metrics_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc b/modules/audio_processing/aec3/echo_remover_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc
rename to modules/audio_processing/aec3/echo_remover_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/erl_estimator.cc b/modules/audio_processing/aec3/erl_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erl_estimator.cc
rename to modules/audio_processing/aec3/erl_estimator.cc
diff --git a/webrtc/modules/audio_processing/aec3/erl_estimator.h b/modules/audio_processing/aec3/erl_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erl_estimator.h
rename to modules/audio_processing/aec3/erl_estimator.h
diff --git a/webrtc/modules/audio_processing/aec3/erl_estimator_unittest.cc b/modules/audio_processing/aec3/erl_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erl_estimator_unittest.cc
rename to modules/audio_processing/aec3/erl_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/erle_estimator.cc b/modules/audio_processing/aec3/erle_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erle_estimator.cc
rename to modules/audio_processing/aec3/erle_estimator.cc
diff --git a/webrtc/modules/audio_processing/aec3/erle_estimator.h b/modules/audio_processing/aec3/erle_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erle_estimator.h
rename to modules/audio_processing/aec3/erle_estimator.h
diff --git a/webrtc/modules/audio_processing/aec3/erle_estimator_unittest.cc b/modules/audio_processing/aec3/erle_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/erle_estimator_unittest.cc
rename to modules/audio_processing/aec3/erle_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/fft_data.h b/modules/audio_processing/aec3/fft_data.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/fft_data.h
rename to modules/audio_processing/aec3/fft_data.h
diff --git a/webrtc/modules/audio_processing/aec3/fft_data_unittest.cc b/modules/audio_processing/aec3/fft_data_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/fft_data_unittest.cc
rename to modules/audio_processing/aec3/fft_data_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/frame_blocker.cc b/modules/audio_processing/aec3/frame_blocker.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/frame_blocker.cc
rename to modules/audio_processing/aec3/frame_blocker.cc
diff --git a/webrtc/modules/audio_processing/aec3/frame_blocker.h b/modules/audio_processing/aec3/frame_blocker.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/frame_blocker.h
rename to modules/audio_processing/aec3/frame_blocker.h
diff --git a/webrtc/modules/audio_processing/aec3/frame_blocker_unittest.cc b/modules/audio_processing/aec3/frame_blocker_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/frame_blocker_unittest.cc
rename to modules/audio_processing/aec3/frame_blocker_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc b/modules/audio_processing/aec3/main_filter_update_gain.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc
rename to modules/audio_processing/aec3/main_filter_update_gain.cc
diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.h b/modules/audio_processing/aec3/main_filter_update_gain.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/main_filter_update_gain.h
rename to modules/audio_processing/aec3/main_filter_update_gain.h
diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
rename to modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter.cc b/modules/audio_processing/aec3/matched_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter.cc
rename to modules/audio_processing/aec3/matched_filter.cc
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter.h
rename to modules/audio_processing/aec3/matched_filter.h
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
rename to modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
rename to modules/audio_processing/aec3/matched_filter_lag_aggregator.h
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc
rename to modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc b/modules/audio_processing/aec3/matched_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc
rename to modules/audio_processing/aec3/matched_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_block_processor.h b/modules/audio_processing/aec3/mock/mock_block_processor.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/mock/mock_block_processor.h
rename to modules/audio_processing/aec3/mock/mock_block_processor.h
diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h b/modules/audio_processing/aec3/mock/mock_echo_remover.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h
rename to modules/audio_processing/aec3/mock/mock_echo_remover.h
diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h b/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h
rename to modules/audio_processing/aec3/mock/mock_render_delay_buffer.h
diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h b/modules/audio_processing/aec3/mock/mock_render_delay_controller.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h
rename to modules/audio_processing/aec3/mock/mock_render_delay_controller.h
diff --git a/webrtc/modules/audio_processing/aec3/output_selector.cc b/modules/audio_processing/aec3/output_selector.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/output_selector.cc
rename to modules/audio_processing/aec3/output_selector.cc
diff --git a/webrtc/modules/audio_processing/aec3/output_selector.h b/modules/audio_processing/aec3/output_selector.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/output_selector.h
rename to modules/audio_processing/aec3/output_selector.h
diff --git a/webrtc/modules/audio_processing/aec3/output_selector_unittest.cc b/modules/audio_processing/aec3/output_selector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/output_selector_unittest.cc
rename to modules/audio_processing/aec3/output_selector_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_buffer.cc b/modules/audio_processing/aec3/render_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_buffer.cc
rename to modules/audio_processing/aec3/render_buffer.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_buffer.h
rename to modules/audio_processing/aec3/render_buffer.h
diff --git a/webrtc/modules/audio_processing/aec3/render_buffer_unittest.cc b/modules/audio_processing/aec3/render_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_buffer_unittest.cc
rename to modules/audio_processing/aec3/render_buffer_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_buffer.cc
rename to modules/audio_processing/aec3/render_delay_buffer.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer.h b/modules/audio_processing/aec3/render_delay_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_buffer.h
rename to modules/audio_processing/aec3/render_delay_buffer.h
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc b/modules/audio_processing/aec3/render_delay_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc
rename to modules/audio_processing/aec3/render_delay_buffer_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller.cc b/modules/audio_processing/aec3/render_delay_controller.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller.cc
rename to modules/audio_processing/aec3/render_delay_controller.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller.h b/modules/audio_processing/aec3/render_delay_controller.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller.h
rename to modules/audio_processing/aec3/render_delay_controller.h
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.cc b/modules/audio_processing/aec3/render_delay_controller_metrics.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.cc
rename to modules/audio_processing/aec3/render_delay_controller_metrics.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h b/modules/audio_processing/aec3/render_delay_controller_metrics.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h
rename to modules/audio_processing/aec3/render_delay_controller_metrics.h
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc b/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc
rename to modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc b/modules/audio_processing/aec3/render_delay_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc
rename to modules/audio_processing/aec3/render_delay_controller_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc b/modules/audio_processing/aec3/render_signal_analyzer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc
rename to modules/audio_processing/aec3/render_signal_analyzer.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.h b/modules/audio_processing/aec3/render_signal_analyzer.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_signal_analyzer.h
rename to modules/audio_processing/aec3/render_signal_analyzer.h
diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc
rename to modules/audio_processing/aec3/render_signal_analyzer_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc b/modules/audio_processing/aec3/residual_echo_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc
rename to modules/audio_processing/aec3/residual_echo_estimator.cc
diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.h b/modules/audio_processing/aec3/residual_echo_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/residual_echo_estimator.h
rename to modules/audio_processing/aec3/residual_echo_estimator.h
diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc b/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc
rename to modules/audio_processing/aec3/residual_echo_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc b/modules/audio_processing/aec3/shadow_filter_update_gain.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc
rename to modules/audio_processing/aec3/shadow_filter_update_gain.cc
diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h b/modules/audio_processing/aec3/shadow_filter_update_gain.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h
rename to modules/audio_processing/aec3/shadow_filter_update_gain.h
diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc
rename to modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/subtractor.cc b/modules/audio_processing/aec3/subtractor.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/subtractor.cc
rename to modules/audio_processing/aec3/subtractor.cc
diff --git a/webrtc/modules/audio_processing/aec3/subtractor.h b/modules/audio_processing/aec3/subtractor.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/subtractor.h
rename to modules/audio_processing/aec3/subtractor.h
diff --git a/webrtc/modules/audio_processing/aec3/subtractor_output.h b/modules/audio_processing/aec3/subtractor_output.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/subtractor_output.h
rename to modules/audio_processing/aec3/subtractor_output.h
diff --git a/webrtc/modules/audio_processing/aec3/subtractor_unittest.cc b/modules/audio_processing/aec3/subtractor_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/subtractor_unittest.cc
rename to modules/audio_processing/aec3/subtractor_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/suppression_filter.cc b/modules/audio_processing/aec3/suppression_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_filter.cc
rename to modules/audio_processing/aec3/suppression_filter.cc
diff --git a/webrtc/modules/audio_processing/aec3/suppression_filter.h b/modules/audio_processing/aec3/suppression_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_filter.h
rename to modules/audio_processing/aec3/suppression_filter.h
diff --git a/webrtc/modules/audio_processing/aec3/suppression_filter_unittest.cc b/modules/audio_processing/aec3/suppression_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_filter_unittest.cc
rename to modules/audio_processing/aec3/suppression_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_gain.cc
rename to modules/audio_processing/aec3/suppression_gain.cc
diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_gain.h
rename to modules/audio_processing/aec3/suppression_gain.h
diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc b/modules/audio_processing/aec3/suppression_gain_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc
rename to modules/audio_processing/aec3/suppression_gain_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/vector_math.h b/modules/audio_processing/aec3/vector_math.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/vector_math.h
rename to modules/audio_processing/aec3/vector_math.h
diff --git a/webrtc/modules/audio_processing/aec3/vector_math_unittest.cc b/modules/audio_processing/aec3/vector_math_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec3/vector_math_unittest.cc
rename to modules/audio_processing/aec3/vector_math_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/BUILD.gn
rename to modules/audio_processing/aec_dump/BUILD.gn
diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h b/modules/audio_processing/aec_dump/aec_dump_factory.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h
rename to modules/audio_processing/aec_dump/aec_dump_factory.h
diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc b/modules/audio_processing/aec_dump/aec_dump_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc
rename to modules/audio_processing/aec_dump/aec_dump_impl.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h b/modules/audio_processing/aec_dump/aec_dump_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h
rename to modules/audio_processing/aec_dump/aec_dump_impl.h
diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc b/modules/audio_processing/aec_dump/aec_dump_integration_test.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc
rename to modules/audio_processing/aec_dump/aec_dump_integration_test.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc b/modules/audio_processing/aec_dump/aec_dump_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc
rename to modules/audio_processing/aec_dump/aec_dump_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/capture_stream_info.cc b/modules/audio_processing/aec_dump/capture_stream_info.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/capture_stream_info.cc
rename to modules/audio_processing/aec_dump/capture_stream_info.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/capture_stream_info.h b/modules/audio_processing/aec_dump/capture_stream_info.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/capture_stream_info.h
rename to modules/audio_processing/aec_dump/capture_stream_info.h
diff --git a/webrtc/modules/audio_processing/aec_dump/mock_aec_dump.cc b/modules/audio_processing/aec_dump/mock_aec_dump.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/mock_aec_dump.cc
rename to modules/audio_processing/aec_dump/mock_aec_dump.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/mock_aec_dump.h b/modules/audio_processing/aec_dump/mock_aec_dump.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/mock_aec_dump.h
rename to modules/audio_processing/aec_dump/mock_aec_dump.h
diff --git a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/modules/audio_processing/aec_dump/null_aec_dump_factory.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc
rename to modules/audio_processing/aec_dump/null_aec_dump_factory.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc b/modules/audio_processing/aec_dump/write_to_file_task.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc
rename to modules/audio_processing/aec_dump/write_to_file_task.cc
diff --git a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.h b/modules/audio_processing/aec_dump/write_to_file_task.h
similarity index 100%
rename from webrtc/modules/audio_processing/aec_dump/write_to_file_task.h
rename to modules/audio_processing/aec_dump/write_to_file_task.h
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.cc b/modules/audio_processing/aecm/aecm_core.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_core.cc
rename to modules/audio_processing/aecm/aecm_core.cc
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.h b/modules/audio_processing/aecm/aecm_core.h
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_core.h
rename to modules/audio_processing/aecm/aecm_core.h
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.cc b/modules/audio_processing/aecm/aecm_core_c.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_core_c.cc
rename to modules/audio_processing/aecm/aecm_core_c.cc
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc b/modules/audio_processing/aecm/aecm_core_mips.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_core_mips.cc
rename to modules/audio_processing/aecm/aecm_core_mips.cc
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc b/modules/audio_processing/aecm/aecm_core_neon.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_core_neon.cc
rename to modules/audio_processing/aecm/aecm_core_neon.cc
diff --git a/webrtc/modules/audio_processing/aecm/aecm_defines.h b/modules/audio_processing/aecm/aecm_defines.h
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/aecm_defines.h
rename to modules/audio_processing/aecm/aecm_defines.h
diff --git a/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc b/modules/audio_processing/aecm/echo_control_mobile.cc
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/echo_control_mobile.cc
rename to modules/audio_processing/aecm/echo_control_mobile.cc
diff --git a/webrtc/modules/audio_processing/aecm/echo_control_mobile.h b/modules/audio_processing/aecm/echo_control_mobile.h
similarity index 100%
rename from webrtc/modules/audio_processing/aecm/echo_control_mobile.h
rename to modules/audio_processing/aecm/echo_control_mobile.h
diff --git a/webrtc/modules/audio_processing/agc/agc.cc b/modules/audio_processing/agc/agc.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/agc.cc
rename to modules/audio_processing/agc/agc.cc
diff --git a/webrtc/modules/audio_processing/agc/agc.h b/modules/audio_processing/agc/agc.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/agc.h
rename to modules/audio_processing/agc/agc.h
diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.cc b/modules/audio_processing/agc/agc_manager_direct.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/agc_manager_direct.cc
rename to modules/audio_processing/agc/agc_manager_direct.cc
diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.h b/modules/audio_processing/agc/agc_manager_direct.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/agc_manager_direct.h
rename to modules/audio_processing/agc/agc_manager_direct.h
diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/modules/audio_processing/agc/agc_manager_direct_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc
rename to modules/audio_processing/agc/agc_manager_direct_unittest.cc
diff --git a/webrtc/modules/audio_processing/agc/gain_map_internal.h b/modules/audio_processing/agc/gain_map_internal.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/gain_map_internal.h
rename to modules/audio_processing/agc/gain_map_internal.h
diff --git a/webrtc/modules/audio_processing/agc/legacy/analog_agc.c b/modules/audio_processing/agc/legacy/analog_agc.c
similarity index 100%
rename from webrtc/modules/audio_processing/agc/legacy/analog_agc.c
rename to modules/audio_processing/agc/legacy/analog_agc.c
diff --git a/webrtc/modules/audio_processing/agc/legacy/analog_agc.h b/modules/audio_processing/agc/legacy/analog_agc.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/legacy/analog_agc.h
rename to modules/audio_processing/agc/legacy/analog_agc.h
diff --git a/webrtc/modules/audio_processing/agc/legacy/digital_agc.c b/modules/audio_processing/agc/legacy/digital_agc.c
similarity index 100%
rename from webrtc/modules/audio_processing/agc/legacy/digital_agc.c
rename to modules/audio_processing/agc/legacy/digital_agc.c
diff --git a/webrtc/modules/audio_processing/agc/legacy/digital_agc.h b/modules/audio_processing/agc/legacy/digital_agc.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/legacy/digital_agc.h
rename to modules/audio_processing/agc/legacy/digital_agc.h
diff --git a/webrtc/modules/audio_processing/agc/legacy/gain_control.h b/modules/audio_processing/agc/legacy/gain_control.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/legacy/gain_control.h
rename to modules/audio_processing/agc/legacy/gain_control.h
diff --git a/webrtc/modules/audio_processing/agc/loudness_histogram.cc b/modules/audio_processing/agc/loudness_histogram.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/loudness_histogram.cc
rename to modules/audio_processing/agc/loudness_histogram.cc
diff --git a/webrtc/modules/audio_processing/agc/loudness_histogram.h b/modules/audio_processing/agc/loudness_histogram.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/loudness_histogram.h
rename to modules/audio_processing/agc/loudness_histogram.h
diff --git a/webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc
rename to modules/audio_processing/agc/loudness_histogram_unittest.cc
diff --git a/webrtc/modules/audio_processing/agc/mock_agc.h b/modules/audio_processing/agc/mock_agc.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/mock_agc.h
rename to modules/audio_processing/agc/mock_agc.h
diff --git a/webrtc/modules/audio_processing/agc/utility.cc b/modules/audio_processing/agc/utility.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc/utility.cc
rename to modules/audio_processing/agc/utility.cc
diff --git a/webrtc/modules/audio_processing/agc/utility.h b/modules/audio_processing/agc/utility.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc/utility.h
rename to modules/audio_processing/agc/utility.h
diff --git a/webrtc/modules/audio_processing/agc2/digital_gain_applier.cc b/modules/audio_processing/agc2/digital_gain_applier.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc2/digital_gain_applier.cc
rename to modules/audio_processing/agc2/digital_gain_applier.cc
diff --git a/webrtc/modules/audio_processing/agc2/digital_gain_applier.h b/modules/audio_processing/agc2/digital_gain_applier.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc2/digital_gain_applier.h
rename to modules/audio_processing/agc2/digital_gain_applier.h
diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2.cc b/modules/audio_processing/agc2/gain_controller2.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc2/gain_controller2.cc
rename to modules/audio_processing/agc2/gain_controller2.cc
diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2.h b/modules/audio_processing/agc2/gain_controller2.h
similarity index 100%
rename from webrtc/modules/audio_processing/agc2/gain_controller2.h
rename to modules/audio_processing/agc2/gain_controller2.h
diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc b/modules/audio_processing/agc2/gain_controller2_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc
rename to modules/audio_processing/agc2/gain_controller2_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/modules/audio_processing/audio_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_buffer.cc
rename to modules/audio_processing/audio_buffer.cc
diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/modules/audio_processing/audio_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/audio_buffer.h
rename to modules/audio_processing/audio_buffer.h
diff --git a/webrtc/modules/audio_processing/audio_buffer_unittest.cc b/modules/audio_processing/audio_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_buffer_unittest.cc
rename to modules/audio_processing/audio_buffer_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_impl.cc
rename to modules/audio_processing/audio_processing_impl.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_impl.h
rename to modules/audio_processing/audio_processing_impl.h
diff --git a/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc
rename to modules/audio_processing/audio_processing_impl_locking_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
rename to modules/audio_processing/audio_processing_impl_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_performance_unittest.cc
rename to modules/audio_processing/audio_processing_performance_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/audio_processing_unittest.cc
rename to modules/audio_processing/audio_processing_unittest.cc
diff --git a/webrtc/modules/audio_processing/beamformer/array_util.cc b/modules/audio_processing/beamformer/array_util.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/array_util.cc
rename to modules/audio_processing/beamformer/array_util.cc
diff --git a/webrtc/modules/audio_processing/beamformer/array_util.h b/modules/audio_processing/beamformer/array_util.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/array_util.h
rename to modules/audio_processing/beamformer/array_util.h
diff --git a/webrtc/modules/audio_processing/beamformer/array_util_unittest.cc b/modules/audio_processing/beamformer/array_util_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/array_util_unittest.cc
rename to modules/audio_processing/beamformer/array_util_unittest.cc
diff --git a/webrtc/modules/audio_processing/beamformer/complex_matrix.h b/modules/audio_processing/beamformer/complex_matrix.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/complex_matrix.h
rename to modules/audio_processing/beamformer/complex_matrix.h
diff --git a/webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc b/modules/audio_processing/beamformer/complex_matrix_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc
rename to modules/audio_processing/beamformer/complex_matrix_unittest.cc
diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc b/modules/audio_processing/beamformer/covariance_matrix_generator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc
rename to modules/audio_processing/beamformer/covariance_matrix_generator.cc
diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h b/modules/audio_processing/beamformer/covariance_matrix_generator.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h
rename to modules/audio_processing/beamformer/covariance_matrix_generator.h
diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
rename to modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
diff --git a/webrtc/modules/audio_processing/beamformer/matrix.h b/modules/audio_processing/beamformer/matrix.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/matrix.h
rename to modules/audio_processing/beamformer/matrix.h
diff --git a/webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h b/modules/audio_processing/beamformer/matrix_test_helpers.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h
rename to modules/audio_processing/beamformer/matrix_test_helpers.h
diff --git a/webrtc/modules/audio_processing/beamformer/matrix_unittest.cc b/modules/audio_processing/beamformer/matrix_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/matrix_unittest.cc
rename to modules/audio_processing/beamformer/matrix_unittest.cc
diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
rename to modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc b/modules/audio_processing/beamformer/nonlinear_beamformer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc
rename to modules/audio_processing/beamformer/nonlinear_beamformer.cc
diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h b/modules/audio_processing/beamformer/nonlinear_beamformer.h
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h
rename to modules/audio_processing/beamformer/nonlinear_beamformer.h
diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc
rename to modules/audio_processing/beamformer/nonlinear_beamformer_test.cc
diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
rename to modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
diff --git a/webrtc/modules/audio_processing/common.h b/modules/audio_processing/common.h
similarity index 100%
rename from webrtc/modules/audio_processing/common.h
rename to modules/audio_processing/common.h
diff --git a/webrtc/modules/audio_processing/config_unittest.cc b/modules/audio_processing/config_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/config_unittest.cc
rename to modules/audio_processing/config_unittest.cc
diff --git a/webrtc/modules/audio_processing/debug.proto b/modules/audio_processing/debug.proto
similarity index 100%
rename from webrtc/modules/audio_processing/debug.proto
rename to modules/audio_processing/debug.proto
diff --git a/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
rename to modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/modules/audio_processing/echo_cancellation_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_cancellation_impl.cc
rename to modules/audio_processing/echo_cancellation_impl.cc
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/modules/audio_processing/echo_cancellation_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_cancellation_impl.h
rename to modules/audio_processing/echo_cancellation_impl.h
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc
rename to modules/audio_processing/echo_cancellation_impl_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_control_mobile_impl.cc
rename to modules/audio_processing/echo_control_mobile_impl.cc
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.h b/modules/audio_processing/echo_control_mobile_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_control_mobile_impl.h
rename to modules/audio_processing/echo_control_mobile_impl.h
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_control_mobile_unittest.cc
rename to modules/audio_processing/echo_control_mobile_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/circular_buffer.cc b/modules/audio_processing/echo_detector/circular_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/circular_buffer.cc
rename to modules/audio_processing/echo_detector/circular_buffer.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/circular_buffer.h b/modules/audio_processing/echo_detector/circular_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/circular_buffer.h
rename to modules/audio_processing/echo_detector/circular_buffer.h
diff --git a/webrtc/modules/audio_processing/echo_detector/circular_buffer_unittest.cc b/modules/audio_processing/echo_detector/circular_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/circular_buffer_unittest.cc
rename to modules/audio_processing/echo_detector/circular_buffer_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc b/modules/audio_processing/echo_detector/mean_variance_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc
rename to modules/audio_processing/echo_detector/mean_variance_estimator.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h b/modules/audio_processing/echo_detector/mean_variance_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h
rename to modules/audio_processing/echo_detector/mean_variance_estimator.h
diff --git a/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc b/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc
rename to modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/moving_max.cc b/modules/audio_processing/echo_detector/moving_max.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/moving_max.cc
rename to modules/audio_processing/echo_detector/moving_max.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/moving_max.h b/modules/audio_processing/echo_detector/moving_max.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/moving_max.h
rename to modules/audio_processing/echo_detector/moving_max.h
diff --git a/webrtc/modules/audio_processing/echo_detector/moving_max_unittest.cc b/modules/audio_processing/echo_detector/moving_max_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/moving_max_unittest.cc
rename to modules/audio_processing/echo_detector/moving_max_unittest.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc b/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
rename to modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
diff --git a/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h b/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
rename to modules/audio_processing/echo_detector/normalized_covariance_estimator.h
diff --git a/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc b/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc
rename to modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc b/modules/audio_processing/gain_control_for_experimental_agc.cc
similarity index 100%
rename from webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc
rename to modules/audio_processing/gain_control_for_experimental_agc.cc
diff --git a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.h b/modules/audio_processing/gain_control_for_experimental_agc.h
similarity index 100%
rename from webrtc/modules/audio_processing/gain_control_for_experimental_agc.h
rename to modules/audio_processing/gain_control_for_experimental_agc.h
diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/modules/audio_processing/gain_control_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/gain_control_impl.cc
rename to modules/audio_processing/gain_control_impl.cc
diff --git a/webrtc/modules/audio_processing/gain_control_impl.h b/modules/audio_processing/gain_control_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/gain_control_impl.h
rename to modules/audio_processing/gain_control_impl.h
diff --git a/webrtc/modules/audio_processing/gain_control_unittest.cc b/modules/audio_processing/gain_control_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/gain_control_unittest.cc
rename to modules/audio_processing/gain_control_unittest.cc
diff --git a/webrtc/modules/audio_processing/include/aec_dump.cc b/modules/audio_processing/include/aec_dump.cc
similarity index 100%
rename from webrtc/modules/audio_processing/include/aec_dump.cc
rename to modules/audio_processing/include/aec_dump.cc
diff --git a/webrtc/modules/audio_processing/include/aec_dump.h b/modules/audio_processing/include/aec_dump.h
similarity index 100%
rename from webrtc/modules/audio_processing/include/aec_dump.h
rename to modules/audio_processing/include/aec_dump.h
diff --git a/webrtc/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc
similarity index 100%
rename from webrtc/modules/audio_processing/include/audio_processing.cc
rename to modules/audio_processing/include/audio_processing.cc
diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
similarity index 100%
rename from webrtc/modules/audio_processing/include/audio_processing.h
rename to modules/audio_processing/include/audio_processing.h
diff --git a/webrtc/modules/audio_processing/include/config.cc b/modules/audio_processing/include/config.cc
similarity index 100%
rename from webrtc/modules/audio_processing/include/config.cc
rename to modules/audio_processing/include/config.cc
diff --git a/webrtc/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h
similarity index 100%
rename from webrtc/modules/audio_processing/include/config.h
rename to modules/audio_processing/include/config.h
diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h
similarity index 100%
rename from webrtc/modules/audio_processing/include/mock_audio_processing.h
rename to modules/audio_processing/include/mock_audio_processing.h
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
rename to modules/audio_processing/intelligibility/intelligibility_enhancer.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h b/modules/audio_processing/intelligibility/intelligibility_enhancer.h
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
rename to modules/audio_processing/intelligibility/intelligibility_enhancer.h
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
rename to modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc b/modules/audio_processing/intelligibility/intelligibility_utils.cc
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc
rename to modules/audio_processing/intelligibility/intelligibility_utils.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h b/modules/audio_processing/intelligibility/intelligibility_utils.h
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h
rename to modules/audio_processing/intelligibility/intelligibility_utils.h
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
rename to modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
similarity index 100%
rename from webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
rename to modules/audio_processing/intelligibility/test/intelligibility_proc.cc
diff --git a/webrtc/modules/audio_processing/level_controller/biquad_filter.cc b/modules/audio_processing/level_controller/biquad_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/biquad_filter.cc
rename to modules/audio_processing/level_controller/biquad_filter.cc
diff --git a/webrtc/modules/audio_processing/level_controller/biquad_filter.h b/modules/audio_processing/level_controller/biquad_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/biquad_filter.h
rename to modules/audio_processing/level_controller/biquad_filter.h
diff --git a/webrtc/modules/audio_processing/level_controller/down_sampler.cc b/modules/audio_processing/level_controller/down_sampler.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/down_sampler.cc
rename to modules/audio_processing/level_controller/down_sampler.cc
diff --git a/webrtc/modules/audio_processing/level_controller/down_sampler.h b/modules/audio_processing/level_controller/down_sampler.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/down_sampler.h
rename to modules/audio_processing/level_controller/down_sampler.h
diff --git a/webrtc/modules/audio_processing/level_controller/gain_applier.cc b/modules/audio_processing/level_controller/gain_applier.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/gain_applier.cc
rename to modules/audio_processing/level_controller/gain_applier.cc
diff --git a/webrtc/modules/audio_processing/level_controller/gain_applier.h b/modules/audio_processing/level_controller/gain_applier.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/gain_applier.h
rename to modules/audio_processing/level_controller/gain_applier.h
diff --git a/webrtc/modules/audio_processing/level_controller/gain_selector.cc b/modules/audio_processing/level_controller/gain_selector.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/gain_selector.cc
rename to modules/audio_processing/level_controller/gain_selector.cc
diff --git a/webrtc/modules/audio_processing/level_controller/gain_selector.h b/modules/audio_processing/level_controller/gain_selector.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/gain_selector.h
rename to modules/audio_processing/level_controller/gain_selector.h
diff --git a/webrtc/modules/audio_processing/level_controller/level_controller.cc b/modules/audio_processing/level_controller/level_controller.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/level_controller.cc
rename to modules/audio_processing/level_controller/level_controller.cc
diff --git a/webrtc/modules/audio_processing/level_controller/level_controller.h b/modules/audio_processing/level_controller/level_controller.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/level_controller.h
rename to modules/audio_processing/level_controller/level_controller.h
diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
rename to modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_constants.h b/modules/audio_processing/level_controller/level_controller_constants.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/level_controller_constants.h
rename to modules/audio_processing/level_controller/level_controller_constants.h
diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc b/modules/audio_processing/level_controller/level_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc
rename to modules/audio_processing/level_controller/level_controller_unittest.cc
diff --git a/webrtc/modules/audio_processing/level_controller/noise_level_estimator.cc b/modules/audio_processing/level_controller/noise_level_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/noise_level_estimator.cc
rename to modules/audio_processing/level_controller/noise_level_estimator.cc
diff --git a/webrtc/modules/audio_processing/level_controller/noise_level_estimator.h b/modules/audio_processing/level_controller/noise_level_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/noise_level_estimator.h
rename to modules/audio_processing/level_controller/noise_level_estimator.h
diff --git a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc b/modules/audio_processing/level_controller/noise_spectrum_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc
rename to modules/audio_processing/level_controller/noise_spectrum_estimator.cc
diff --git a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h b/modules/audio_processing/level_controller/noise_spectrum_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h
rename to modules/audio_processing/level_controller/noise_spectrum_estimator.h
diff --git a/webrtc/modules/audio_processing/level_controller/peak_level_estimator.cc b/modules/audio_processing/level_controller/peak_level_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/peak_level_estimator.cc
rename to modules/audio_processing/level_controller/peak_level_estimator.cc
diff --git a/webrtc/modules/audio_processing/level_controller/peak_level_estimator.h b/modules/audio_processing/level_controller/peak_level_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/peak_level_estimator.h
rename to modules/audio_processing/level_controller/peak_level_estimator.h
diff --git a/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.cc b/modules/audio_processing/level_controller/saturating_gain_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.cc
rename to modules/audio_processing/level_controller/saturating_gain_estimator.cc
diff --git a/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h b/modules/audio_processing/level_controller/saturating_gain_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h
rename to modules/audio_processing/level_controller/saturating_gain_estimator.h
diff --git a/webrtc/modules/audio_processing/level_controller/signal_classifier.cc b/modules/audio_processing/level_controller/signal_classifier.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/signal_classifier.cc
rename to modules/audio_processing/level_controller/signal_classifier.cc
diff --git a/webrtc/modules/audio_processing/level_controller/signal_classifier.h b/modules/audio_processing/level_controller/signal_classifier.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_controller/signal_classifier.h
rename to modules/audio_processing/level_controller/signal_classifier.h
diff --git a/webrtc/modules/audio_processing/level_estimator_impl.cc b/modules/audio_processing/level_estimator_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_estimator_impl.cc
rename to modules/audio_processing/level_estimator_impl.cc
diff --git a/webrtc/modules/audio_processing/level_estimator_impl.h b/modules/audio_processing/level_estimator_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/level_estimator_impl.h
rename to modules/audio_processing/level_estimator_impl.h
diff --git a/webrtc/modules/audio_processing/level_estimator_unittest.cc b/modules/audio_processing/level_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/level_estimator_unittest.cc
rename to modules/audio_processing/level_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.cc b/modules/audio_processing/logging/apm_data_dumper.cc
similarity index 100%
rename from webrtc/modules/audio_processing/logging/apm_data_dumper.cc
rename to modules/audio_processing/logging/apm_data_dumper.cc
diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h
similarity index 100%
rename from webrtc/modules/audio_processing/logging/apm_data_dumper.h
rename to modules/audio_processing/logging/apm_data_dumper.h
diff --git a/webrtc/modules/audio_processing/low_cut_filter.cc b/modules/audio_processing/low_cut_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/low_cut_filter.cc
rename to modules/audio_processing/low_cut_filter.cc
diff --git a/webrtc/modules/audio_processing/low_cut_filter.h b/modules/audio_processing/low_cut_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/low_cut_filter.h
rename to modules/audio_processing/low_cut_filter.h
diff --git a/webrtc/modules/audio_processing/low_cut_filter_unittest.cc b/modules/audio_processing/low_cut_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/low_cut_filter_unittest.cc
rename to modules/audio_processing/low_cut_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/noise_suppression_impl.cc
rename to modules/audio_processing/noise_suppression_impl.cc
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.h b/modules/audio_processing/noise_suppression_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/noise_suppression_impl.h
rename to modules/audio_processing/noise_suppression_impl.h
diff --git a/webrtc/modules/audio_processing/noise_suppression_unittest.cc b/modules/audio_processing/noise_suppression_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/noise_suppression_unittest.cc
rename to modules/audio_processing/noise_suppression_unittest.cc
diff --git a/webrtc/modules/audio_processing/ns/defines.h b/modules/audio_processing/ns/defines.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/defines.h
rename to modules/audio_processing/ns/defines.h
diff --git a/webrtc/modules/audio_processing/ns/noise_suppression.c b/modules/audio_processing/ns/noise_suppression.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/noise_suppression.c
rename to modules/audio_processing/ns/noise_suppression.c
diff --git a/webrtc/modules/audio_processing/ns/noise_suppression.h b/modules/audio_processing/ns/noise_suppression.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/noise_suppression.h
rename to modules/audio_processing/ns/noise_suppression.h
diff --git a/webrtc/modules/audio_processing/ns/noise_suppression_x.c b/modules/audio_processing/ns/noise_suppression_x.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/noise_suppression_x.c
rename to modules/audio_processing/ns/noise_suppression_x.c
diff --git a/webrtc/modules/audio_processing/ns/noise_suppression_x.h b/modules/audio_processing/ns/noise_suppression_x.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/noise_suppression_x.h
rename to modules/audio_processing/ns/noise_suppression_x.h
diff --git a/webrtc/modules/audio_processing/ns/ns_core.c b/modules/audio_processing/ns/ns_core.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/ns_core.c
rename to modules/audio_processing/ns/ns_core.c
diff --git a/webrtc/modules/audio_processing/ns/ns_core.h b/modules/audio_processing/ns/ns_core.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/ns_core.h
rename to modules/audio_processing/ns/ns_core.h
diff --git a/webrtc/modules/audio_processing/ns/nsx_core.c b/modules/audio_processing/ns/nsx_core.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_core.c
rename to modules/audio_processing/ns/nsx_core.c
diff --git a/webrtc/modules/audio_processing/ns/nsx_core.h b/modules/audio_processing/ns/nsx_core.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_core.h
rename to modules/audio_processing/ns/nsx_core.h
diff --git a/webrtc/modules/audio_processing/ns/nsx_core_c.c b/modules/audio_processing/ns/nsx_core_c.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_core_c.c
rename to modules/audio_processing/ns/nsx_core_c.c
diff --git a/webrtc/modules/audio_processing/ns/nsx_core_mips.c b/modules/audio_processing/ns/nsx_core_mips.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_core_mips.c
rename to modules/audio_processing/ns/nsx_core_mips.c
diff --git a/webrtc/modules/audio_processing/ns/nsx_core_neon.c b/modules/audio_processing/ns/nsx_core_neon.c
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_core_neon.c
rename to modules/audio_processing/ns/nsx_core_neon.c
diff --git a/webrtc/modules/audio_processing/ns/nsx_defines.h b/modules/audio_processing/ns/nsx_defines.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/nsx_defines.h
rename to modules/audio_processing/ns/nsx_defines.h
diff --git a/webrtc/modules/audio_processing/ns/windows_private.h b/modules/audio_processing/ns/windows_private.h
similarity index 100%
rename from webrtc/modules/audio_processing/ns/windows_private.h
rename to modules/audio_processing/ns/windows_private.h
diff --git a/webrtc/modules/audio_processing/render_queue_item_verifier.h b/modules/audio_processing/render_queue_item_verifier.h
similarity index 100%
rename from webrtc/modules/audio_processing/render_queue_item_verifier.h
rename to modules/audio_processing/render_queue_item_verifier.h
diff --git a/webrtc/modules/audio_processing/residual_echo_detector.cc b/modules/audio_processing/residual_echo_detector.cc
similarity index 100%
rename from webrtc/modules/audio_processing/residual_echo_detector.cc
rename to modules/audio_processing/residual_echo_detector.cc
diff --git a/webrtc/modules/audio_processing/residual_echo_detector.h b/modules/audio_processing/residual_echo_detector.h
similarity index 100%
rename from webrtc/modules/audio_processing/residual_echo_detector.h
rename to modules/audio_processing/residual_echo_detector.h
diff --git a/webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc b/modules/audio_processing/residual_echo_detector_complexity_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc
rename to modules/audio_processing/residual_echo_detector_complexity_unittest.cc
diff --git a/webrtc/modules/audio_processing/residual_echo_detector_unittest.cc b/modules/audio_processing/residual_echo_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/residual_echo_detector_unittest.cc
rename to modules/audio_processing/residual_echo_detector_unittest.cc
diff --git a/webrtc/modules/audio_processing/rms_level.cc b/modules/audio_processing/rms_level.cc
similarity index 100%
rename from webrtc/modules/audio_processing/rms_level.cc
rename to modules/audio_processing/rms_level.cc
diff --git a/webrtc/modules/audio_processing/rms_level.h b/modules/audio_processing/rms_level.h
similarity index 100%
rename from webrtc/modules/audio_processing/rms_level.h
rename to modules/audio_processing/rms_level.h
diff --git a/webrtc/modules/audio_processing/rms_level_unittest.cc b/modules/audio_processing/rms_level_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/rms_level_unittest.cc
rename to modules/audio_processing/rms_level_unittest.cc
diff --git a/webrtc/modules/audio_processing/splitting_filter.cc b/modules/audio_processing/splitting_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/splitting_filter.cc
rename to modules/audio_processing/splitting_filter.cc
diff --git a/webrtc/modules/audio_processing/splitting_filter.h b/modules/audio_processing/splitting_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/splitting_filter.h
rename to modules/audio_processing/splitting_filter.h
diff --git a/webrtc/modules/audio_processing/splitting_filter_unittest.cc b/modules/audio_processing/splitting_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/splitting_filter_unittest.cc
rename to modules/audio_processing/splitting_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc
rename to modules/audio_processing/test/aec_dump_based_simulator.cc
diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h b/modules/audio_processing/test/aec_dump_based_simulator.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/aec_dump_based_simulator.h
rename to modules/audio_processing/test/aec_dump_based_simulator.h
diff --git a/webrtc/modules/audio_processing/test/android/apmtest/AndroidManifest.xml b/modules/audio_processing/test/android/apmtest/AndroidManifest.xml
similarity index 100%
rename from webrtc/modules/audio_processing/test/android/apmtest/AndroidManifest.xml
rename to modules/audio_processing/test/android/apmtest/AndroidManifest.xml
diff --git a/webrtc/modules/audio_processing/test/android/apmtest/default.properties b/modules/audio_processing/test/android/apmtest/default.properties
similarity index 100%
rename from webrtc/modules/audio_processing/test/android/apmtest/default.properties
rename to modules/audio_processing/test/android/apmtest/default.properties
diff --git a/webrtc/modules/audio_processing/test/android/apmtest/jni/main.c b/modules/audio_processing/test/android/apmtest/jni/main.c
similarity index 100%
rename from webrtc/modules/audio_processing/test/android/apmtest/jni/main.c
rename to modules/audio_processing/test/android/apmtest/jni/main.c
diff --git a/webrtc/modules/audio_processing/test/android/apmtest/res/values/strings.xml b/modules/audio_processing/test/android/apmtest/res/values/strings.xml
similarity index 100%
rename from webrtc/modules/audio_processing/test/android/apmtest/res/values/strings.xml
rename to modules/audio_processing/test/android/apmtest/res/values/strings.xml
diff --git a/webrtc/modules/audio_processing/test/apmtest.m b/modules/audio_processing/test/apmtest.m
similarity index 100%
rename from webrtc/modules/audio_processing/test/apmtest.m
rename to modules/audio_processing/test/apmtest.m
diff --git a/webrtc/modules/audio_processing/test/audio_buffer_tools.cc b/modules/audio_processing/test/audio_buffer_tools.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/audio_buffer_tools.cc
rename to modules/audio_processing/test/audio_buffer_tools.cc
diff --git a/webrtc/modules/audio_processing/test/audio_buffer_tools.h b/modules/audio_processing/test/audio_buffer_tools.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/audio_buffer_tools.h
rename to modules/audio_processing/test/audio_buffer_tools.h
diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/audio_processing_simulator.cc
rename to modules/audio_processing/test/audio_processing_simulator.cc
diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/audio_processing_simulator.h
rename to modules/audio_processing/test/audio_processing_simulator.h
diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/modules/audio_processing/test/audioproc_float.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/audioproc_float.cc
rename to modules/audio_processing/test/audioproc_float.cc
diff --git a/webrtc/modules/audio_processing/test/bitexactness_tools.cc b/modules/audio_processing/test/bitexactness_tools.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/bitexactness_tools.cc
rename to modules/audio_processing/test/bitexactness_tools.cc
diff --git a/webrtc/modules/audio_processing/test/bitexactness_tools.h b/modules/audio_processing/test/bitexactness_tools.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/bitexactness_tools.h
rename to modules/audio_processing/test/bitexactness_tools.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
rename to modules/audio_processing/test/conversational_speech/BUILD.gn
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/OWNERS b/modules/audio_processing/test/conversational_speech/OWNERS
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/OWNERS
rename to modules/audio_processing/test/conversational_speech/OWNERS
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/README.md b/modules/audio_processing/test/conversational_speech/README.md
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/README.md
rename to modules/audio_processing/test/conversational_speech/README.md
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/config.cc b/modules/audio_processing/test/conversational_speech/config.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/config.cc
rename to modules/audio_processing/test/conversational_speech/config.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/config.h b/modules/audio_processing/test/conversational_speech/config.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/config.h
rename to modules/audio_processing/test/conversational_speech/config.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/generator.cc b/modules/audio_processing/test/conversational_speech/generator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/generator.cc
rename to modules/audio_processing/test/conversational_speech/generator.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/modules/audio_processing/test/conversational_speech/generator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc
rename to modules/audio_processing/test/conversational_speech/generator_unittest.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.cc b/modules/audio_processing/test/conversational_speech/mock_wavreader.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.cc
rename to modules/audio_processing/test/conversational_speech/mock_wavreader.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h b/modules/audio_processing/test/conversational_speech/mock_wavreader.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h
rename to modules/audio_processing/test/conversational_speech/mock_wavreader.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc
rename to modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
rename to modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc b/modules/audio_processing/test/conversational_speech/multiend_call.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc
rename to modules/audio_processing/test/conversational_speech/multiend_call.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h b/modules/audio_processing/test/conversational_speech/multiend_call.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h
rename to modules/audio_processing/test/conversational_speech/multiend_call.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/simulator.cc b/modules/audio_processing/test/conversational_speech/simulator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/simulator.cc
rename to modules/audio_processing/test/conversational_speech/simulator.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/simulator.h b/modules/audio_processing/test/conversational_speech/simulator.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/simulator.h
rename to modules/audio_processing/test/conversational_speech/simulator.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/timing.cc b/modules/audio_processing/test/conversational_speech/timing.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/timing.cc
rename to modules/audio_processing/test/conversational_speech/timing.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/timing.h b/modules/audio_processing/test/conversational_speech/timing.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/timing.h
rename to modules/audio_processing/test/conversational_speech/timing.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h b/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h
rename to modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc b/modules/audio_processing/test/conversational_speech/wavreader_factory.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc
rename to modules/audio_processing/test/conversational_speech/wavreader_factory.cc
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h b/modules/audio_processing/test/conversational_speech/wavreader_factory.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h
rename to modules/audio_processing/test/conversational_speech/wavreader_factory.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h b/modules/audio_processing/test/conversational_speech/wavreader_interface.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h
rename to modules/audio_processing/test/conversational_speech/wavreader_interface.h
diff --git a/webrtc/modules/audio_processing/test/debug_dump_replayer.cc b/modules/audio_processing/test/debug_dump_replayer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/debug_dump_replayer.cc
rename to modules/audio_processing/test/debug_dump_replayer.cc
diff --git a/webrtc/modules/audio_processing/test/debug_dump_replayer.h b/modules/audio_processing/test/debug_dump_replayer.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/debug_dump_replayer.h
rename to modules/audio_processing/test/debug_dump_replayer.h
diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/debug_dump_test.cc
rename to modules/audio_processing/test/debug_dump_test.cc
diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc b/modules/audio_processing/test/echo_canceller_test_tools.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc
rename to modules/audio_processing/test/echo_canceller_test_tools.cc
diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.h b/modules/audio_processing/test/echo_canceller_test_tools.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/echo_canceller_test_tools.h
rename to modules/audio_processing/test/echo_canceller_test_tools.h
diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc b/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc
rename to modules/audio_processing/test/echo_canceller_test_tools_unittest.cc
diff --git a/webrtc/modules/audio_processing/test/performance_timer.cc b/modules/audio_processing/test/performance_timer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/performance_timer.cc
rename to modules/audio_processing/test/performance_timer.cc
diff --git a/webrtc/modules/audio_processing/test/performance_timer.h b/modules/audio_processing/test/performance_timer.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/performance_timer.h
rename to modules/audio_processing/test/performance_timer.h
diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.cc b/modules/audio_processing/test/protobuf_utils.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/protobuf_utils.cc
rename to modules/audio_processing/test/protobuf_utils.cc
diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.h b/modules/audio_processing/test/protobuf_utils.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/protobuf_utils.h
rename to modules/audio_processing/test/protobuf_utils.h
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn
rename to modules/audio_processing/test/py_quality_assessment/BUILD.gn
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/OWNERS b/modules/audio_processing/test/py_quality_assessment/OWNERS
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/OWNERS
rename to modules/audio_processing/test/py_quality_assessment/OWNERS
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/README.md b/modules/audio_processing/test/py_quality_assessment/README.md
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/README.md
rename to modules/audio_processing/test/py_quality_assessment/README.md
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_configs/default.json b/modules/audio_processing/test/py_quality_assessment/apm_configs/default.json
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_configs/default.json
rename to modules/audio_processing/test/py_quality_assessment/apm_configs/default.json
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.py
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.sh b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.sh
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.sh
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment.sh
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_export.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_export.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_export.py
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_export.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_optimize.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_optimize.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_optimize.py
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_optimize.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_unittest.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/output/README.md b/modules/audio_processing/test/py_quality_assessment/output/README.md
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/output/README.md
rename to modules/audio_processing/test/py_quality_assessment/output/README.md
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/__init__.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/__init__.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/__init__.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/__init__.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/apm_configs/default.json b/modules/audio_processing/test/py_quality_assessment/quality_assessment/apm_configs/default.json
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/apm_configs/default.json
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/apm_configs/default.json
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/audioproc_wrapper.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/audioproc_wrapper.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/audioproc_wrapper.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/audioproc_wrapper.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/collect_data.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/collect_data.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/collect_data.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/collect_data.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/data_access.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/data_access.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/data_access.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/data_access.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_factory.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_factory.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_factory.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_factory.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/echo_path_simulation_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_factory.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_factory.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_factory.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_factory.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/eval_scores_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/evaluation.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/evaluation.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/evaluation.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/evaluation.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/exceptions.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/exceptions.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/exceptions.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/exceptions.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/export.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/export.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/export.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/export.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc b/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/input_mixer_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_signal_creator.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_signal_creator.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/input_signal_creator.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/input_signal_creator.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.css b/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.css
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.css
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/results.css
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.js b/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.js
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/results.js
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/results.js
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/signal_processing_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/simulation_unittest.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_factory.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_factory.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_factory.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_factory.py
diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_unittest.py b/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_unittest.py
similarity index 100%
rename from webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_unittest.py
rename to modules/audio_processing/test/py_quality_assessment/quality_assessment/test_data_generation_unittest.py
diff --git a/webrtc/modules/audio_processing/test/simulator_buffers.cc b/modules/audio_processing/test/simulator_buffers.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/simulator_buffers.cc
rename to modules/audio_processing/test/simulator_buffers.cc
diff --git a/webrtc/modules/audio_processing/test/simulator_buffers.h b/modules/audio_processing/test/simulator_buffers.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/simulator_buffers.h
rename to modules/audio_processing/test/simulator_buffers.h
diff --git a/webrtc/modules/audio_processing/test/test_utils.cc b/modules/audio_processing/test/test_utils.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/test_utils.cc
rename to modules/audio_processing/test/test_utils.cc
diff --git a/webrtc/modules/audio_processing/test/test_utils.h b/modules/audio_processing/test/test_utils.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/test_utils.h
rename to modules/audio_processing/test/test_utils.h
diff --git a/webrtc/modules/audio_processing/test/unittest.proto b/modules/audio_processing/test/unittest.proto
similarity index 100%
rename from webrtc/modules/audio_processing/test/unittest.proto
rename to modules/audio_processing/test/unittest.proto
diff --git a/webrtc/modules/audio_processing/test/unpack.cc b/modules/audio_processing/test/unpack.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/unpack.cc
rename to modules/audio_processing/test/unpack.cc
diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.cc b/modules/audio_processing/test/wav_based_simulator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/test/wav_based_simulator.cc
rename to modules/audio_processing/test/wav_based_simulator.cc
diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.h b/modules/audio_processing/test/wav_based_simulator.h
similarity index 100%
rename from webrtc/modules/audio_processing/test/wav_based_simulator.h
rename to modules/audio_processing/test/wav_based_simulator.h
diff --git a/webrtc/modules/audio_processing/three_band_filter_bank.cc b/modules/audio_processing/three_band_filter_bank.cc
similarity index 100%
rename from webrtc/modules/audio_processing/three_band_filter_bank.cc
rename to modules/audio_processing/three_band_filter_bank.cc
diff --git a/webrtc/modules/audio_processing/three_band_filter_bank.h b/modules/audio_processing/three_band_filter_bank.h
similarity index 100%
rename from webrtc/modules/audio_processing/three_band_filter_bank.h
rename to modules/audio_processing/three_band_filter_bank.h
diff --git a/webrtc/modules/audio_processing/transient/click_annotate.cc b/modules/audio_processing/transient/click_annotate.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/click_annotate.cc
rename to modules/audio_processing/transient/click_annotate.cc
diff --git a/webrtc/modules/audio_processing/transient/common.h b/modules/audio_processing/transient/common.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/common.h
rename to modules/audio_processing/transient/common.h
diff --git a/webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h b/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h
rename to modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h
diff --git a/webrtc/modules/audio_processing/transient/dyadic_decimator.h b/modules/audio_processing/transient/dyadic_decimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/dyadic_decimator.h
rename to modules/audio_processing/transient/dyadic_decimator.h
diff --git a/webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc b/modules/audio_processing/transient/dyadic_decimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc
rename to modules/audio_processing/transient/dyadic_decimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/file_utils.cc b/modules/audio_processing/transient/file_utils.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/file_utils.cc
rename to modules/audio_processing/transient/file_utils.cc
diff --git a/webrtc/modules/audio_processing/transient/file_utils.h b/modules/audio_processing/transient/file_utils.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/file_utils.h
rename to modules/audio_processing/transient/file_utils.h
diff --git a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/file_utils_unittest.cc
rename to modules/audio_processing/transient/file_utils_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/moving_moments.cc b/modules/audio_processing/transient/moving_moments.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/moving_moments.cc
rename to modules/audio_processing/transient/moving_moments.cc
diff --git a/webrtc/modules/audio_processing/transient/moving_moments.h b/modules/audio_processing/transient/moving_moments.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/moving_moments.h
rename to modules/audio_processing/transient/moving_moments.h
diff --git a/webrtc/modules/audio_processing/transient/moving_moments_unittest.cc b/modules/audio_processing/transient/moving_moments_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/moving_moments_unittest.cc
rename to modules/audio_processing/transient/moving_moments_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/test/plotDetection.m b/modules/audio_processing/transient/test/plotDetection.m
similarity index 100%
rename from webrtc/modules/audio_processing/transient/test/plotDetection.m
rename to modules/audio_processing/transient/test/plotDetection.m
diff --git a/webrtc/modules/audio_processing/transient/test/readDetection.m b/modules/audio_processing/transient/test/readDetection.m
similarity index 100%
rename from webrtc/modules/audio_processing/transient/test/readDetection.m
rename to modules/audio_processing/transient/test/readDetection.m
diff --git a/webrtc/modules/audio_processing/transient/test/readPCM.m b/modules/audio_processing/transient/test/readPCM.m
similarity index 100%
rename from webrtc/modules/audio_processing/transient/test/readPCM.m
rename to modules/audio_processing/transient/test/readPCM.m
diff --git a/webrtc/modules/audio_processing/transient/transient_detector.cc b/modules/audio_processing/transient/transient_detector.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_detector.cc
rename to modules/audio_processing/transient/transient_detector.cc
diff --git a/webrtc/modules/audio_processing/transient/transient_detector.h b/modules/audio_processing/transient/transient_detector.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_detector.h
rename to modules/audio_processing/transient/transient_detector.h
diff --git a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_detector_unittest.cc
rename to modules/audio_processing/transient/transient_detector_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_suppression_test.cc
rename to modules/audio_processing/transient/transient_suppression_test.cc
diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor.cc b/modules/audio_processing/transient/transient_suppressor.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_suppressor.cc
rename to modules/audio_processing/transient/transient_suppressor.cc
diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor.h b/modules/audio_processing/transient/transient_suppressor.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_suppressor.h
rename to modules/audio_processing/transient/transient_suppressor.h
diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc b/modules/audio_processing/transient/transient_suppressor_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc
rename to modules/audio_processing/transient/transient_suppressor_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_node.cc b/modules/audio_processing/transient/wpd_node.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_node.cc
rename to modules/audio_processing/transient/wpd_node.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_node.h b/modules/audio_processing/transient/wpd_node.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_node.h
rename to modules/audio_processing/transient/wpd_node.h
diff --git a/webrtc/modules/audio_processing/transient/wpd_node_unittest.cc b/modules/audio_processing/transient/wpd_node_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_node_unittest.cc
rename to modules/audio_processing/transient/wpd_node_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree.cc b/modules/audio_processing/transient/wpd_tree.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_tree.cc
rename to modules/audio_processing/transient/wpd_tree.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree.h b/modules/audio_processing/transient/wpd_tree.h
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_tree.h
rename to modules/audio_processing/transient/wpd_tree.h
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc
rename to modules/audio_processing/transient/wpd_tree_unittest.cc
diff --git a/webrtc/modules/audio_processing/typing_detection.cc b/modules/audio_processing/typing_detection.cc
similarity index 100%
rename from webrtc/modules/audio_processing/typing_detection.cc
rename to modules/audio_processing/typing_detection.cc
diff --git a/webrtc/modules/audio_processing/typing_detection.h b/modules/audio_processing/typing_detection.h
similarity index 100%
rename from webrtc/modules/audio_processing/typing_detection.h
rename to modules/audio_processing/typing_detection.h
diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator.cc b/modules/audio_processing/utility/block_mean_calculator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/block_mean_calculator.cc
rename to modules/audio_processing/utility/block_mean_calculator.cc
diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator.h b/modules/audio_processing/utility/block_mean_calculator.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/block_mean_calculator.h
rename to modules/audio_processing/utility/block_mean_calculator.h
diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc b/modules/audio_processing/utility/block_mean_calculator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc
rename to modules/audio_processing/utility/block_mean_calculator_unittest.cc
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator.cc b/modules/audio_processing/utility/delay_estimator.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator.cc
rename to modules/audio_processing/utility/delay_estimator.cc
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator.h b/modules/audio_processing/utility/delay_estimator.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator.h
rename to modules/audio_processing/utility/delay_estimator.h
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_internal.h b/modules/audio_processing/utility/delay_estimator_internal.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator_internal.h
rename to modules/audio_processing/utility/delay_estimator_internal.h
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc b/modules/audio_processing/utility/delay_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc
rename to modules/audio_processing/utility/delay_estimator_unittest.cc
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc b/modules/audio_processing/utility/delay_estimator_wrapper.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc
rename to modules/audio_processing/utility/delay_estimator_wrapper.cc
diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h b/modules/audio_processing/utility/delay_estimator_wrapper.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h
rename to modules/audio_processing/utility/delay_estimator_wrapper.h
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft.cc b/modules/audio_processing/utility/ooura_fft.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft.cc
rename to modules/audio_processing/utility/ooura_fft.cc
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft.h b/modules/audio_processing/utility/ooura_fft.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft.h
rename to modules/audio_processing/utility/ooura_fft.h
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft_mips.cc b/modules/audio_processing/utility/ooura_fft_mips.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft_mips.cc
rename to modules/audio_processing/utility/ooura_fft_mips.cc
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft_neon.cc b/modules/audio_processing/utility/ooura_fft_neon.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft_neon.cc
rename to modules/audio_processing/utility/ooura_fft_neon.cc
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc b/modules/audio_processing/utility/ooura_fft_sse2.cc
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
rename to modules/audio_processing/utility/ooura_fft_sse2.cc
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h b/modules/audio_processing/utility/ooura_fft_tables_common.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h
rename to modules/audio_processing/utility/ooura_fft_tables_common.h
diff --git a/webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h b/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h
similarity index 100%
rename from webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h
rename to modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h
diff --git a/webrtc/modules/audio_processing/vad/common.h b/modules/audio_processing/vad/common.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/common.h
rename to modules/audio_processing/vad/common.h
diff --git a/webrtc/modules/audio_processing/vad/gmm.cc b/modules/audio_processing/vad/gmm.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/gmm.cc
rename to modules/audio_processing/vad/gmm.cc
diff --git a/webrtc/modules/audio_processing/vad/gmm.h b/modules/audio_processing/vad/gmm.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/gmm.h
rename to modules/audio_processing/vad/gmm.h
diff --git a/webrtc/modules/audio_processing/vad/gmm_unittest.cc b/modules/audio_processing/vad/gmm_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/gmm_unittest.cc
rename to modules/audio_processing/vad/gmm_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/noise_gmm_tables.h b/modules/audio_processing/vad/noise_gmm_tables.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/noise_gmm_tables.h
rename to modules/audio_processing/vad/noise_gmm_tables.h
diff --git a/webrtc/modules/audio_processing/vad/pitch_based_vad.cc b/modules/audio_processing/vad/pitch_based_vad.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_based_vad.cc
rename to modules/audio_processing/vad/pitch_based_vad.cc
diff --git a/webrtc/modules/audio_processing/vad/pitch_based_vad.h b/modules/audio_processing/vad/pitch_based_vad.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_based_vad.h
rename to modules/audio_processing/vad/pitch_based_vad.h
diff --git a/webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/modules/audio_processing/vad/pitch_based_vad_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc
rename to modules/audio_processing/vad/pitch_based_vad_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/pitch_internal.cc b/modules/audio_processing/vad/pitch_internal.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_internal.cc
rename to modules/audio_processing/vad/pitch_internal.cc
diff --git a/webrtc/modules/audio_processing/vad/pitch_internal.h b/modules/audio_processing/vad/pitch_internal.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_internal.h
rename to modules/audio_processing/vad/pitch_internal.h
diff --git a/webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc b/modules/audio_processing/vad/pitch_internal_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc
rename to modules/audio_processing/vad/pitch_internal_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/pole_zero_filter.cc b/modules/audio_processing/vad/pole_zero_filter.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pole_zero_filter.cc
rename to modules/audio_processing/vad/pole_zero_filter.cc
diff --git a/webrtc/modules/audio_processing/vad/pole_zero_filter.h b/modules/audio_processing/vad/pole_zero_filter.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pole_zero_filter.h
rename to modules/audio_processing/vad/pole_zero_filter.h
diff --git a/webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc
rename to modules/audio_processing/vad/pole_zero_filter_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/standalone_vad.cc b/modules/audio_processing/vad/standalone_vad.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/standalone_vad.cc
rename to modules/audio_processing/vad/standalone_vad.cc
diff --git a/webrtc/modules/audio_processing/vad/standalone_vad.h b/modules/audio_processing/vad/standalone_vad.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/standalone_vad.h
rename to modules/audio_processing/vad/standalone_vad.h
diff --git a/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc
rename to modules/audio_processing/vad/standalone_vad_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc b/modules/audio_processing/vad/vad_audio_proc.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc.cc
rename to modules/audio_processing/vad/vad_audio_proc.cc
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.h b/modules/audio_processing/vad/vad_audio_proc.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc.h
rename to modules/audio_processing/vad/vad_audio_proc.h
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h b/modules/audio_processing/vad/vad_audio_proc_internal.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h
rename to modules/audio_processing/vad/vad_audio_proc_internal.h
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc
rename to modules/audio_processing/vad/vad_audio_proc_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/vad_circular_buffer.cc b/modules/audio_processing/vad/vad_circular_buffer.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_circular_buffer.cc
rename to modules/audio_processing/vad/vad_circular_buffer.cc
diff --git a/webrtc/modules/audio_processing/vad/vad_circular_buffer.h b/modules/audio_processing/vad/vad_circular_buffer.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_circular_buffer.h
rename to modules/audio_processing/vad/vad_circular_buffer.h
diff --git a/webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
rename to modules/audio_processing/vad/vad_circular_buffer_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc b/modules/audio_processing/vad/voice_activity_detector.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/voice_activity_detector.cc
rename to modules/audio_processing/vad/voice_activity_detector.cc
diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.h b/modules/audio_processing/vad/voice_activity_detector.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/voice_activity_detector.h
rename to modules/audio_processing/vad/voice_activity_detector.h
diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/modules/audio_processing/vad/voice_activity_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc
rename to modules/audio_processing/vad/voice_activity_detector_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/voice_gmm_tables.h b/modules/audio_processing/vad/voice_gmm_tables.h
similarity index 100%
rename from webrtc/modules/audio_processing/vad/voice_gmm_tables.h
rename to modules/audio_processing/vad/voice_gmm_tables.h
diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/modules/audio_processing/voice_detection_impl.cc
similarity index 100%
rename from webrtc/modules/audio_processing/voice_detection_impl.cc
rename to modules/audio_processing/voice_detection_impl.cc
diff --git a/webrtc/modules/audio_processing/voice_detection_impl.h b/modules/audio_processing/voice_detection_impl.h
similarity index 100%
rename from webrtc/modules/audio_processing/voice_detection_impl.h
rename to modules/audio_processing/voice_detection_impl.h
diff --git a/webrtc/modules/audio_processing/voice_detection_unittest.cc b/modules/audio_processing/voice_detection_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_processing/voice_detection_unittest.cc
rename to modules/audio_processing/voice_detection_unittest.cc
diff --git a/webrtc/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
similarity index 100%
rename from webrtc/modules/bitrate_controller/BUILD.gn
rename to modules/bitrate_controller/BUILD.gn
diff --git a/webrtc/modules/bitrate_controller/DEPS b/modules/bitrate_controller/DEPS
similarity index 100%
rename from webrtc/modules/bitrate_controller/DEPS
rename to modules/bitrate_controller/DEPS
diff --git a/webrtc/modules/bitrate_controller/OWNERS b/modules/bitrate_controller/OWNERS
similarity index 100%
rename from webrtc/modules/bitrate_controller/OWNERS
rename to modules/bitrate_controller/OWNERS
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/modules/bitrate_controller/bitrate_controller_impl.cc
similarity index 100%
rename from webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
rename to modules/bitrate_controller/bitrate_controller_impl.cc
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/modules/bitrate_controller/bitrate_controller_impl.h
similarity index 100%
rename from webrtc/modules/bitrate_controller/bitrate_controller_impl.h
rename to modules/bitrate_controller/bitrate_controller_impl.h
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/modules/bitrate_controller/bitrate_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
rename to modules/bitrate_controller/bitrate_controller_unittest.cc
diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/modules/bitrate_controller/include/bitrate_controller.h
similarity index 100%
rename from webrtc/modules/bitrate_controller/include/bitrate_controller.h
rename to modules/bitrate_controller/include/bitrate_controller.h
diff --git a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
similarity index 100%
rename from webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
rename to modules/bitrate_controller/include/mock/mock_bitrate_controller.h
diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
similarity index 100%
rename from webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc
rename to modules/bitrate_controller/send_side_bandwidth_estimation.cc
diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h b/modules/bitrate_controller/send_side_bandwidth_estimation.h
similarity index 100%
rename from webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h
rename to modules/bitrate_controller/send_side_bandwidth_estimation.h
diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
similarity index 100%
rename from webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
rename to modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
diff --git a/webrtc/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
similarity index 100%
rename from webrtc/modules/congestion_controller/BUILD.gn
rename to modules/congestion_controller/BUILD.gn
diff --git a/webrtc/modules/congestion_controller/DEPS b/modules/congestion_controller/DEPS
similarity index 100%
rename from webrtc/modules/congestion_controller/DEPS
rename to modules/congestion_controller/DEPS
diff --git a/webrtc/modules/congestion_controller/OWNERS b/modules/congestion_controller/OWNERS
similarity index 100%
rename from webrtc/modules/congestion_controller/OWNERS
rename to modules/congestion_controller/OWNERS
diff --git a/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/acknowledged_bitrate_estimator.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc
rename to modules/congestion_controller/acknowledged_bitrate_estimator.cc
diff --git a/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h b/modules/congestion_controller/acknowledged_bitrate_estimator.h
similarity index 100%
rename from webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h
rename to modules/congestion_controller/acknowledged_bitrate_estimator.h
diff --git a/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
rename to modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/bitrate_estimator.cc b/modules/congestion_controller/bitrate_estimator.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/bitrate_estimator.cc
rename to modules/congestion_controller/bitrate_estimator.cc
diff --git a/webrtc/modules/congestion_controller/bitrate_estimator.h b/modules/congestion_controller/bitrate_estimator.h
similarity index 100%
rename from webrtc/modules/congestion_controller/bitrate_estimator.h
rename to modules/congestion_controller/bitrate_estimator.h
diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc b/modules/congestion_controller/congestion_controller_unittests_helper.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc
rename to modules/congestion_controller/congestion_controller_unittests_helper.cc
diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h b/modules/congestion_controller/congestion_controller_unittests_helper.h
similarity index 100%
rename from webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h
rename to modules/congestion_controller/congestion_controller_unittests_helper.h
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.cc b/modules/congestion_controller/delay_based_bwe.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/delay_based_bwe.cc
rename to modules/congestion_controller/delay_based_bwe.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.h b/modules/congestion_controller/delay_based_bwe.h
similarity index 100%
rename from webrtc/modules/congestion_controller/delay_based_bwe.h
rename to modules/congestion_controller/delay_based_bwe.h
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/modules/congestion_controller/delay_based_bwe_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
rename to modules/congestion_controller/delay_based_bwe_unittest.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
rename to modules/congestion_controller/delay_based_bwe_unittest_helper.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
similarity index 100%
rename from webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h
rename to modules/congestion_controller/delay_based_bwe_unittest_helper.h
diff --git a/webrtc/modules/congestion_controller/include/mock/mock_congestion_observer.h b/modules/congestion_controller/include/mock/mock_congestion_observer.h
similarity index 100%
rename from webrtc/modules/congestion_controller/include/mock/mock_congestion_observer.h
rename to modules/congestion_controller/include/mock/mock_congestion_observer.h
diff --git a/webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h b/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h
similarity index 100%
rename from webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h
rename to modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h b/modules/congestion_controller/include/receive_side_congestion_controller.h
similarity index 100%
rename from webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h
rename to modules/congestion_controller/include/receive_side_congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h
similarity index 100%
rename from webrtc/modules/congestion_controller/include/send_side_congestion_controller.h
rename to modules/congestion_controller/include/send_side_congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/median_slope_estimator.cc b/modules/congestion_controller/median_slope_estimator.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/median_slope_estimator.cc
rename to modules/congestion_controller/median_slope_estimator.cc
diff --git a/webrtc/modules/congestion_controller/median_slope_estimator.h b/modules/congestion_controller/median_slope_estimator.h
similarity index 100%
rename from webrtc/modules/congestion_controller/median_slope_estimator.h
rename to modules/congestion_controller/median_slope_estimator.h
diff --git a/webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc b/modules/congestion_controller/median_slope_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc
rename to modules/congestion_controller/median_slope_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc b/modules/congestion_controller/probe_bitrate_estimator.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_bitrate_estimator.cc
rename to modules/congestion_controller/probe_bitrate_estimator.cc
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator.h b/modules/congestion_controller/probe_bitrate_estimator.h
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_bitrate_estimator.h
rename to modules/congestion_controller/probe_bitrate_estimator.h
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
rename to modules/congestion_controller/probe_bitrate_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/probe_controller.cc b/modules/congestion_controller/probe_controller.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_controller.cc
rename to modules/congestion_controller/probe_controller.cc
diff --git a/webrtc/modules/congestion_controller/probe_controller.h b/modules/congestion_controller/probe_controller.h
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_controller.h
rename to modules/congestion_controller/probe_controller.h
diff --git a/webrtc/modules/congestion_controller/probe_controller_unittest.cc b/modules/congestion_controller/probe_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/probe_controller_unittest.cc
rename to modules/congestion_controller/probe_controller_unittest.cc
diff --git a/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc b/modules/congestion_controller/receive_side_congestion_controller.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/receive_side_congestion_controller.cc
rename to modules/congestion_controller/receive_side_congestion_controller.cc
diff --git a/webrtc/modules/congestion_controller/receive_side_congestion_controller_unittest.cc b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
rename to modules/congestion_controller/receive_side_congestion_controller_unittest.cc
diff --git a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/send_side_congestion_controller.cc
rename to modules/congestion_controller/send_side_congestion_controller.cc
diff --git a/webrtc/modules/congestion_controller/send_side_congestion_controller_unittest.cc b/modules/congestion_controller/send_side_congestion_controller_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/send_side_congestion_controller_unittest.cc
rename to modules/congestion_controller/send_side_congestion_controller_unittest.cc
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/modules/congestion_controller/transport_feedback_adapter.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/transport_feedback_adapter.cc
rename to modules/congestion_controller/transport_feedback_adapter.cc
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.h b/modules/congestion_controller/transport_feedback_adapter.h
similarity index 100%
rename from webrtc/modules/congestion_controller/transport_feedback_adapter.h
rename to modules/congestion_controller/transport_feedback_adapter.h
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/transport_feedback_adapter_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc
rename to modules/congestion_controller/transport_feedback_adapter_unittest.cc
diff --git a/webrtc/modules/congestion_controller/trendline_estimator.cc b/modules/congestion_controller/trendline_estimator.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/trendline_estimator.cc
rename to modules/congestion_controller/trendline_estimator.cc
diff --git a/webrtc/modules/congestion_controller/trendline_estimator.h b/modules/congestion_controller/trendline_estimator.h
similarity index 100%
rename from webrtc/modules/congestion_controller/trendline_estimator.h
rename to modules/congestion_controller/trendline_estimator.h
diff --git a/webrtc/modules/congestion_controller/trendline_estimator_unittest.cc b/modules/congestion_controller/trendline_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/congestion_controller/trendline_estimator_unittest.cc
rename to modules/congestion_controller/trendline_estimator_unittest.cc
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
similarity index 100%
rename from webrtc/modules/desktop_capture/BUILD.gn
rename to modules/desktop_capture/BUILD.gn
diff --git a/webrtc/modules/desktop_capture/DEPS b/modules/desktop_capture/DEPS
similarity index 100%
rename from webrtc/modules/desktop_capture/DEPS
rename to modules/desktop_capture/DEPS
diff --git a/webrtc/modules/desktop_capture/OWNERS b/modules/desktop_capture/OWNERS
similarity index 100%
rename from webrtc/modules/desktop_capture/OWNERS
rename to modules/desktop_capture/OWNERS
diff --git a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
rename to modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
diff --git a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h
similarity index 100%
rename from webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h
rename to modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h
diff --git a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc
rename to modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc
diff --git a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc b/modules/desktop_capture/cropped_desktop_frame.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/cropped_desktop_frame.cc
rename to modules/desktop_capture/cropped_desktop_frame.cc
diff --git a/webrtc/modules/desktop_capture/cropped_desktop_frame.h b/modules/desktop_capture/cropped_desktop_frame.h
similarity index 100%
rename from webrtc/modules/desktop_capture/cropped_desktop_frame.h
rename to modules/desktop_capture/cropped_desktop_frame.h
diff --git a/webrtc/modules/desktop_capture/cropped_desktop_frame_unittest.cc b/modules/desktop_capture/cropped_desktop_frame_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/cropped_desktop_frame_unittest.cc
rename to modules/desktop_capture/cropped_desktop_frame_unittest.cc
diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/modules/desktop_capture/cropping_window_capturer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/cropping_window_capturer.cc
rename to modules/desktop_capture/cropping_window_capturer.cc
diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.h b/modules/desktop_capture/cropping_window_capturer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/cropping_window_capturer.h
rename to modules/desktop_capture/cropping_window_capturer.h
diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc b/modules/desktop_capture/cropping_window_capturer_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/cropping_window_capturer_win.cc
rename to modules/desktop_capture/cropping_window_capturer_win.cc
diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc b/modules/desktop_capture/desktop_and_cursor_composer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
rename to modules/desktop_capture/desktop_and_cursor_composer.cc
diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/modules/desktop_capture/desktop_and_cursor_composer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
rename to modules/desktop_capture/desktop_and_cursor_composer.h
diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
rename to modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
diff --git a/webrtc/modules/desktop_capture/desktop_capture_options.cc b/modules/desktop_capture/desktop_capture_options.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capture_options.cc
rename to modules/desktop_capture/desktop_capture_options.cc
diff --git a/webrtc/modules/desktop_capture/desktop_capture_options.h b/modules/desktop_capture/desktop_capture_options.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capture_options.h
rename to modules/desktop_capture/desktop_capture_options.h
diff --git a/webrtc/modules/desktop_capture/desktop_capture_types.h b/modules/desktop_capture/desktop_capture_types.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capture_types.h
rename to modules/desktop_capture/desktop_capture_types.h
diff --git a/webrtc/modules/desktop_capture/desktop_capturer.cc b/modules/desktop_capture/desktop_capturer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capturer.cc
rename to modules/desktop_capture/desktop_capturer.cc
diff --git a/webrtc/modules/desktop_capture/desktop_capturer.h b/modules/desktop_capture/desktop_capturer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capturer.h
rename to modules/desktop_capture/desktop_capturer.h
diff --git a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
rename to modules/desktop_capture/desktop_capturer_differ_wrapper.cc
diff --git a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h b/modules/desktop_capture/desktop_capturer_differ_wrapper.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h
rename to modules/desktop_capture/desktop_capturer_differ_wrapper.h
diff --git a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
rename to modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame.cc b/modules/desktop_capture/desktop_frame.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame.cc
rename to modules/desktop_capture/desktop_frame.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame.h b/modules/desktop_capture/desktop_frame.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame.h
rename to modules/desktop_capture/desktop_frame.h
diff --git a/webrtc/modules/desktop_capture/desktop_frame_generator.cc b/modules/desktop_capture/desktop_frame_generator.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_generator.cc
rename to modules/desktop_capture/desktop_frame_generator.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame_generator.h b/modules/desktop_capture/desktop_frame_generator.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_generator.h
rename to modules/desktop_capture/desktop_frame_generator.h
diff --git a/webrtc/modules/desktop_capture/desktop_frame_rotation.cc b/modules/desktop_capture/desktop_frame_rotation.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_rotation.cc
rename to modules/desktop_capture/desktop_frame_rotation.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame_rotation.h b/modules/desktop_capture/desktop_frame_rotation.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_rotation.h
rename to modules/desktop_capture/desktop_frame_rotation.h
diff --git a/webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc b/modules/desktop_capture/desktop_frame_rotation_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc
rename to modules/desktop_capture/desktop_frame_rotation_unittest.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.cc b/modules/desktop_capture/desktop_frame_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_win.cc
rename to modules/desktop_capture/desktop_frame_win.cc
diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.h b/modules/desktop_capture/desktop_frame_win.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_frame_win.h
rename to modules/desktop_capture/desktop_frame_win.h
diff --git a/webrtc/modules/desktop_capture/desktop_geometry.cc b/modules/desktop_capture/desktop_geometry.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_geometry.cc
rename to modules/desktop_capture/desktop_geometry.cc
diff --git a/webrtc/modules/desktop_capture/desktop_geometry.h b/modules/desktop_capture/desktop_geometry.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_geometry.h
rename to modules/desktop_capture/desktop_geometry.h
diff --git a/webrtc/modules/desktop_capture/desktop_geometry_unittest.cc b/modules/desktop_capture/desktop_geometry_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_geometry_unittest.cc
rename to modules/desktop_capture/desktop_geometry_unittest.cc
diff --git a/webrtc/modules/desktop_capture/desktop_region.cc b/modules/desktop_capture/desktop_region.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_region.cc
rename to modules/desktop_capture/desktop_region.cc
diff --git a/webrtc/modules/desktop_capture/desktop_region.h b/modules/desktop_capture/desktop_region.h
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_region.h
rename to modules/desktop_capture/desktop_region.h
diff --git a/webrtc/modules/desktop_capture/desktop_region_unittest.cc b/modules/desktop_capture/desktop_region_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/desktop_region_unittest.cc
rename to modules/desktop_capture/desktop_region_unittest.cc
diff --git a/webrtc/modules/desktop_capture/differ_block.cc b/modules/desktop_capture/differ_block.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/differ_block.cc
rename to modules/desktop_capture/differ_block.cc
diff --git a/webrtc/modules/desktop_capture/differ_block.h b/modules/desktop_capture/differ_block.h
similarity index 100%
rename from webrtc/modules/desktop_capture/differ_block.h
rename to modules/desktop_capture/differ_block.h
diff --git a/webrtc/modules/desktop_capture/differ_block_unittest.cc b/modules/desktop_capture/differ_block_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/differ_block_unittest.cc
rename to modules/desktop_capture/differ_block_unittest.cc
diff --git a/webrtc/modules/desktop_capture/differ_vector_sse2.cc b/modules/desktop_capture/differ_vector_sse2.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/differ_vector_sse2.cc
rename to modules/desktop_capture/differ_vector_sse2.cc
diff --git a/webrtc/modules/desktop_capture/differ_vector_sse2.h b/modules/desktop_capture/differ_vector_sse2.h
similarity index 100%
rename from webrtc/modules/desktop_capture/differ_vector_sse2.h
rename to modules/desktop_capture/differ_vector_sse2.h
diff --git a/webrtc/modules/desktop_capture/fake_desktop_capturer.cc b/modules/desktop_capture/fake_desktop_capturer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/fake_desktop_capturer.cc
rename to modules/desktop_capture/fake_desktop_capturer.cc
diff --git a/webrtc/modules/desktop_capture/fake_desktop_capturer.h b/modules/desktop_capture/fake_desktop_capturer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/fake_desktop_capturer.h
rename to modules/desktop_capture/fake_desktop_capturer.h
diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc
rename to modules/desktop_capture/fallback_desktop_capturer_wrapper.cc
diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h b/modules/desktop_capture/fallback_desktop_capturer_wrapper.h
similarity index 100%
rename from webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h
rename to modules/desktop_capture/fallback_desktop_capturer_wrapper.h
diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc b/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc
rename to modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc
diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration.h b/modules/desktop_capture/mac/desktop_configuration.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/desktop_configuration.h
rename to modules/desktop_capture/mac/desktop_configuration.h
diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration.mm b/modules/desktop_capture/mac/desktop_configuration.mm
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/desktop_configuration.mm
rename to modules/desktop_capture/mac/desktop_configuration.mm
diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc b/modules/desktop_capture/mac/desktop_configuration_monitor.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc
rename to modules/desktop_capture/mac/desktop_configuration_monitor.cc
diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h b/modules/desktop_capture/mac/desktop_configuration_monitor.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h
rename to modules/desktop_capture/mac/desktop_configuration_monitor.h
diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
rename to modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h
rename to modules/desktop_capture/mac/full_screen_chrome_window_detector.h
diff --git a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc b/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc
rename to modules/desktop_capture/mac/scoped_pixel_buffer_object.cc
diff --git a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h
rename to modules/desktop_capture/mac/scoped_pixel_buffer_object.h
diff --git a/webrtc/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/window_list_utils.cc
rename to modules/desktop_capture/mac/window_list_utils.cc
diff --git a/webrtc/modules/desktop_capture/mac/window_list_utils.h b/modules/desktop_capture/mac/window_list_utils.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mac/window_list_utils.h
rename to modules/desktop_capture/mac/window_list_utils.h
diff --git a/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.cc b/modules/desktop_capture/mock_desktop_capturer_callback.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mock_desktop_capturer_callback.cc
rename to modules/desktop_capture/mock_desktop_capturer_callback.cc
diff --git a/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h b/modules/desktop_capture/mock_desktop_capturer_callback.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h
rename to modules/desktop_capture/mock_desktop_capturer_callback.h
diff --git a/webrtc/modules/desktop_capture/mouse_cursor.cc b/modules/desktop_capture/mouse_cursor.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor.cc
rename to modules/desktop_capture/mouse_cursor.cc
diff --git a/webrtc/modules/desktop_capture/mouse_cursor.h b/modules/desktop_capture/mouse_cursor.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor.h
rename to modules/desktop_capture/mouse_cursor.h
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor.h b/modules/desktop_capture/mouse_cursor_monitor.h
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor.h
rename to modules/desktop_capture/mouse_cursor_monitor.h
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm
rename to modules/desktop_capture/mouse_cursor_monitor_mac.mm
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc b/modules/desktop_capture/mouse_cursor_monitor_null.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc
rename to modules/desktop_capture/mouse_cursor_monitor_null.cc
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
rename to modules/desktop_capture/mouse_cursor_monitor_unittest.cc
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc b/modules/desktop_capture/mouse_cursor_monitor_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc
rename to modules/desktop_capture/mouse_cursor_monitor_win.cc
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/modules/desktop_capture/mouse_cursor_monitor_x11.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc
rename to modules/desktop_capture/mouse_cursor_monitor_x11.cc
diff --git a/webrtc/modules/desktop_capture/resolution_tracker.cc b/modules/desktop_capture/resolution_tracker.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/resolution_tracker.cc
rename to modules/desktop_capture/resolution_tracker.cc
diff --git a/webrtc/modules/desktop_capture/resolution_tracker.h b/modules/desktop_capture/resolution_tracker.h
similarity index 100%
rename from webrtc/modules/desktop_capture/resolution_tracker.h
rename to modules/desktop_capture/resolution_tracker.h
diff --git a/webrtc/modules/desktop_capture/rgba_color.cc b/modules/desktop_capture/rgba_color.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/rgba_color.cc
rename to modules/desktop_capture/rgba_color.cc
diff --git a/webrtc/modules/desktop_capture/rgba_color.h b/modules/desktop_capture/rgba_color.h
similarity index 100%
rename from webrtc/modules/desktop_capture/rgba_color.h
rename to modules/desktop_capture/rgba_color.h
diff --git a/webrtc/modules/desktop_capture/rgba_color_unittest.cc b/modules/desktop_capture/rgba_color_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/rgba_color_unittest.cc
rename to modules/desktop_capture/rgba_color_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h b/modules/desktop_capture/screen_capture_frame_queue.h
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capture_frame_queue.h
rename to modules/desktop_capture/screen_capture_frame_queue.h
diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.cc b/modules/desktop_capture/screen_capturer_helper.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_helper.cc
rename to modules/desktop_capture/screen_capturer_helper.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.h b/modules/desktop_capture/screen_capturer_helper.h
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_helper.h
rename to modules/desktop_capture/screen_capturer_helper.h
diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc b/modules/desktop_capture/screen_capturer_helper_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc
rename to modules/desktop_capture/screen_capturer_helper_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
rename to modules/desktop_capture/screen_capturer_integration_test.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/modules/desktop_capture/screen_capturer_mac.mm
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_mac.mm
rename to modules/desktop_capture/screen_capturer_mac.mm
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc b/modules/desktop_capture/screen_capturer_mac_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
rename to modules/desktop_capture/screen_capturer_mac_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_null.cc b/modules/desktop_capture/screen_capturer_null.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_null.cc
rename to modules/desktop_capture/screen_capturer_null.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/modules/desktop_capture/screen_capturer_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_unittest.cc
rename to modules/desktop_capture/screen_capturer_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_win.cc b/modules/desktop_capture/screen_capturer_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_win.cc
rename to modules/desktop_capture/screen_capturer_win.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/modules/desktop_capture/screen_capturer_x11.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_capturer_x11.cc
rename to modules/desktop_capture/screen_capturer_x11.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer.cc b/modules/desktop_capture/screen_drawer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer.cc
rename to modules/desktop_capture/screen_drawer.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer.h b/modules/desktop_capture/screen_drawer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer.h
rename to modules/desktop_capture/screen_drawer.h
diff --git a/webrtc/modules/desktop_capture/screen_drawer_linux.cc b/modules/desktop_capture/screen_drawer_linux.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_linux.cc
rename to modules/desktop_capture/screen_drawer_linux.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer_lock_posix.cc b/modules/desktop_capture/screen_drawer_lock_posix.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_lock_posix.cc
rename to modules/desktop_capture/screen_drawer_lock_posix.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer_lock_posix.h b/modules/desktop_capture/screen_drawer_lock_posix.h
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_lock_posix.h
rename to modules/desktop_capture/screen_drawer_lock_posix.h
diff --git a/webrtc/modules/desktop_capture/screen_drawer_mac.cc b/modules/desktop_capture/screen_drawer_mac.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_mac.cc
rename to modules/desktop_capture/screen_drawer_mac.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_unittest.cc
rename to modules/desktop_capture/screen_drawer_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_drawer_win.cc b/modules/desktop_capture/screen_drawer_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/screen_drawer_win.cc
rename to modules/desktop_capture/screen_drawer_win.cc
diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/modules/desktop_capture/shared_desktop_frame.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/shared_desktop_frame.cc
rename to modules/desktop_capture/shared_desktop_frame.cc
diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.h b/modules/desktop_capture/shared_desktop_frame.h
similarity index 100%
rename from webrtc/modules/desktop_capture/shared_desktop_frame.h
rename to modules/desktop_capture/shared_desktop_frame.h
diff --git a/webrtc/modules/desktop_capture/shared_memory.cc b/modules/desktop_capture/shared_memory.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/shared_memory.cc
rename to modules/desktop_capture/shared_memory.cc
diff --git a/webrtc/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h
similarity index 100%
rename from webrtc/modules/desktop_capture/shared_memory.h
rename to modules/desktop_capture/shared_memory.h
diff --git a/webrtc/modules/desktop_capture/test_utils.cc b/modules/desktop_capture/test_utils.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/test_utils.cc
rename to modules/desktop_capture/test_utils.cc
diff --git a/webrtc/modules/desktop_capture/test_utils.h b/modules/desktop_capture/test_utils.h
similarity index 100%
rename from webrtc/modules/desktop_capture/test_utils.h
rename to modules/desktop_capture/test_utils.h
diff --git a/webrtc/modules/desktop_capture/test_utils_unittest.cc b/modules/desktop_capture/test_utils_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/test_utils_unittest.cc
rename to modules/desktop_capture/test_utils_unittest.cc
diff --git a/webrtc/modules/desktop_capture/win/cursor.cc b/modules/desktop_capture/win/cursor.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor.cc
rename to modules/desktop_capture/win/cursor.cc
diff --git a/webrtc/modules/desktop_capture/win/cursor.h b/modules/desktop_capture/win/cursor.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor.h
rename to modules/desktop_capture/win/cursor.h
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/1_24bpp.cur b/modules/desktop_capture/win/cursor_test_data/1_24bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/1_24bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/1_24bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/1_32bpp.cur b/modules/desktop_capture/win/cursor_test_data/1_32bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/1_32bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/1_32bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/1_8bpp.cur b/modules/desktop_capture/win/cursor_test_data/1_8bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/1_8bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/1_8bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/2_1bpp.cur b/modules/desktop_capture/win/cursor_test_data/2_1bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/2_1bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/2_1bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/2_32bpp.cur b/modules/desktop_capture/win/cursor_test_data/2_32bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/2_32bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/2_32bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/3_32bpp.cur b/modules/desktop_capture/win/cursor_test_data/3_32bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/3_32bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/3_32bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_test_data/3_4bpp.cur b/modules/desktop_capture/win/cursor_test_data/3_4bpp.cur
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_test_data/3_4bpp.cur
rename to modules/desktop_capture/win/cursor_test_data/3_4bpp.cur
Binary files differ
diff --git a/webrtc/modules/desktop_capture/win/cursor_unittest.cc b/modules/desktop_capture/win/cursor_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_unittest.cc
rename to modules/desktop_capture/win/cursor_unittest.cc
diff --git a/webrtc/modules/desktop_capture/win/cursor_unittest_resources.h b/modules/desktop_capture/win/cursor_unittest_resources.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_unittest_resources.h
rename to modules/desktop_capture/win/cursor_unittest_resources.h
diff --git a/webrtc/modules/desktop_capture/win/cursor_unittest_resources.rc b/modules/desktop_capture/win/cursor_unittest_resources.rc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/cursor_unittest_resources.rc
rename to modules/desktop_capture/win/cursor_unittest_resources.rc
diff --git a/webrtc/modules/desktop_capture/win/d3d_device.cc b/modules/desktop_capture/win/d3d_device.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/d3d_device.cc
rename to modules/desktop_capture/win/d3d_device.cc
diff --git a/webrtc/modules/desktop_capture/win/d3d_device.h b/modules/desktop_capture/win/d3d_device.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/d3d_device.h
rename to modules/desktop_capture/win/d3d_device.h
diff --git a/webrtc/modules/desktop_capture/win/desktop.cc b/modules/desktop_capture/win/desktop.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/desktop.cc
rename to modules/desktop_capture/win/desktop.cc
diff --git a/webrtc/modules/desktop_capture/win/desktop.h b/modules/desktop_capture/win/desktop.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/desktop.h
rename to modules/desktop_capture/win/desktop.h
diff --git a/webrtc/modules/desktop_capture/win/display_configuration_monitor.cc b/modules/desktop_capture/win/display_configuration_monitor.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/display_configuration_monitor.cc
rename to modules/desktop_capture/win/display_configuration_monitor.cc
diff --git a/webrtc/modules/desktop_capture/win/display_configuration_monitor.h b/modules/desktop_capture/win/display_configuration_monitor.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/display_configuration_monitor.h
rename to modules/desktop_capture/win/display_configuration_monitor.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc b/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
rename to modules/desktop_capture/win/dxgi_adapter_duplicator.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h b/modules/desktop_capture/win/dxgi_adapter_duplicator.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h
rename to modules/desktop_capture/win/dxgi_adapter_duplicator.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_context.cc b/modules/desktop_capture/win/dxgi_context.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_context.cc
rename to modules/desktop_capture/win/dxgi_context.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_context.h b/modules/desktop_capture/win/dxgi_context.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_context.h
rename to modules/desktop_capture/win/dxgi_context.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc b/modules/desktop_capture/win/dxgi_duplicator_controller.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc
rename to modules/desktop_capture/win/dxgi_duplicator_controller.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h b/modules/desktop_capture/win/dxgi_duplicator_controller.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h
rename to modules/desktop_capture/win/dxgi_duplicator_controller.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_frame.cc b/modules/desktop_capture/win/dxgi_frame.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_frame.cc
rename to modules/desktop_capture/win/dxgi_frame.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_frame.h b/modules/desktop_capture/win/dxgi_frame.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_frame.h
rename to modules/desktop_capture/win/dxgi_frame.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc
rename to modules/desktop_capture/win/dxgi_output_duplicator.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h b/modules/desktop_capture/win/dxgi_output_duplicator.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h
rename to modules/desktop_capture/win/dxgi_output_duplicator.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture.cc b/modules/desktop_capture/win/dxgi_texture.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture.cc
rename to modules/desktop_capture/win/dxgi_texture.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture.h b/modules/desktop_capture/win/dxgi_texture.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture.h
rename to modules/desktop_capture/win/dxgi_texture.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc b/modules/desktop_capture/win/dxgi_texture_mapping.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc
rename to modules/desktop_capture/win/dxgi_texture_mapping.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h b/modules/desktop_capture/win/dxgi_texture_mapping.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h
rename to modules/desktop_capture/win/dxgi_texture_mapping.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc b/modules/desktop_capture/win/dxgi_texture_staging.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc
rename to modules/desktop_capture/win/dxgi_texture_staging.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.h b/modules/desktop_capture/win/dxgi_texture_staging.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/dxgi_texture_staging.h
rename to modules/desktop_capture/win/dxgi_texture_staging.h
diff --git a/webrtc/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/scoped_gdi_object.h
rename to modules/desktop_capture/win/scoped_gdi_object.h
diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc b/modules/desktop_capture/win/scoped_thread_desktop.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc
rename to modules/desktop_capture/win/scoped_thread_desktop.cc
diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h b/modules/desktop_capture/win/scoped_thread_desktop.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
rename to modules/desktop_capture/win/scoped_thread_desktop.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capture_utils.cc b/modules/desktop_capture/win/screen_capture_utils.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capture_utils.cc
rename to modules/desktop_capture/win/screen_capture_utils.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capture_utils.h b/modules/desktop_capture/win/screen_capture_utils.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capture_utils.h
rename to modules/desktop_capture/win/screen_capture_utils.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capture_utils_unittest.cc b/modules/desktop_capture/win/screen_capture_utils_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capture_utils_unittest.cc
rename to modules/desktop_capture/win/screen_capture_utils_unittest.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc b/modules/desktop_capture/win/screen_capturer_win_directx.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc
rename to modules/desktop_capture/win/screen_capturer_win_directx.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h b/modules/desktop_capture/win/screen_capturer_win_directx.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
rename to modules/desktop_capture/win/screen_capturer_win_directx.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc b/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc
rename to modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/modules/desktop_capture/win/screen_capturer_win_gdi.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
rename to modules/desktop_capture/win/screen_capturer_win_gdi.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h b/modules/desktop_capture/win/screen_capturer_win_gdi.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h
rename to modules/desktop_capture/win/screen_capturer_win_gdi.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
rename to modules/desktop_capture/win/screen_capturer_win_magnifier.cc
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/modules/desktop_capture/win/screen_capturer_win_magnifier.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h
rename to modules/desktop_capture/win/screen_capturer_win_magnifier.h
diff --git a/webrtc/modules/desktop_capture/win/window_capture_utils.cc b/modules/desktop_capture/win/window_capture_utils.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/win/window_capture_utils.cc
rename to modules/desktop_capture/win/window_capture_utils.cc
diff --git a/webrtc/modules/desktop_capture/win/window_capture_utils.h b/modules/desktop_capture/win/window_capture_utils.h
similarity index 100%
rename from webrtc/modules/desktop_capture/win/window_capture_utils.h
rename to modules/desktop_capture/win/window_capture_utils.h
diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm
similarity index 100%
rename from webrtc/modules/desktop_capture/window_capturer_mac.mm
rename to modules/desktop_capture/window_capturer_mac.mm
diff --git a/webrtc/modules/desktop_capture/window_capturer_null.cc b/modules/desktop_capture/window_capturer_null.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_capturer_null.cc
rename to modules/desktop_capture/window_capturer_null.cc
diff --git a/webrtc/modules/desktop_capture/window_capturer_unittest.cc b/modules/desktop_capture/window_capturer_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_capturer_unittest.cc
rename to modules/desktop_capture/window_capturer_unittest.cc
diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_capturer_win.cc
rename to modules/desktop_capture/window_capturer_win.cc
diff --git a/webrtc/modules/desktop_capture/window_capturer_x11.cc b/modules/desktop_capture/window_capturer_x11.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_capturer_x11.cc
rename to modules/desktop_capture/window_capturer_x11.cc
diff --git a/webrtc/modules/desktop_capture/window_finder.h b/modules/desktop_capture/window_finder.h
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder.h
rename to modules/desktop_capture/window_finder.h
diff --git a/webrtc/modules/desktop_capture/window_finder_mac.h b/modules/desktop_capture/window_finder_mac.h
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_mac.h
rename to modules/desktop_capture/window_finder_mac.h
diff --git a/webrtc/modules/desktop_capture/window_finder_mac.mm b/modules/desktop_capture/window_finder_mac.mm
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_mac.mm
rename to modules/desktop_capture/window_finder_mac.mm
diff --git a/webrtc/modules/desktop_capture/window_finder_unittest.cc b/modules/desktop_capture/window_finder_unittest.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_unittest.cc
rename to modules/desktop_capture/window_finder_unittest.cc
diff --git a/webrtc/modules/desktop_capture/window_finder_win.cc b/modules/desktop_capture/window_finder_win.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_win.cc
rename to modules/desktop_capture/window_finder_win.cc
diff --git a/webrtc/modules/desktop_capture/window_finder_win.h b/modules/desktop_capture/window_finder_win.h
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_win.h
rename to modules/desktop_capture/window_finder_win.h
diff --git a/webrtc/modules/desktop_capture/window_finder_x11.cc b/modules/desktop_capture/window_finder_x11.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_x11.cc
rename to modules/desktop_capture/window_finder_x11.cc
diff --git a/webrtc/modules/desktop_capture/window_finder_x11.h b/modules/desktop_capture/window_finder_x11.h
similarity index 100%
rename from webrtc/modules/desktop_capture/window_finder_x11.h
rename to modules/desktop_capture/window_finder_x11.h
diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.cc b/modules/desktop_capture/x11/shared_x_display.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/shared_x_display.cc
rename to modules/desktop_capture/x11/shared_x_display.cc
diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.h b/modules/desktop_capture/x11/shared_x_display.h
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/shared_x_display.h
rename to modules/desktop_capture/x11/shared_x_display.h
diff --git a/webrtc/modules/desktop_capture/x11/window_list_utils.cc b/modules/desktop_capture/x11/window_list_utils.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/window_list_utils.cc
rename to modules/desktop_capture/x11/window_list_utils.cc
diff --git a/webrtc/modules/desktop_capture/x11/window_list_utils.h b/modules/desktop_capture/x11/window_list_utils.h
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/window_list_utils.h
rename to modules/desktop_capture/x11/window_list_utils.h
diff --git a/webrtc/modules/desktop_capture/x11/x_atom_cache.cc b/modules/desktop_capture/x11/x_atom_cache.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_atom_cache.cc
rename to modules/desktop_capture/x11/x_atom_cache.cc
diff --git a/webrtc/modules/desktop_capture/x11/x_atom_cache.h b/modules/desktop_capture/x11/x_atom_cache.h
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_atom_cache.h
rename to modules/desktop_capture/x11/x_atom_cache.h
diff --git a/webrtc/modules/desktop_capture/x11/x_error_trap.cc b/modules/desktop_capture/x11/x_error_trap.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_error_trap.cc
rename to modules/desktop_capture/x11/x_error_trap.cc
diff --git a/webrtc/modules/desktop_capture/x11/x_error_trap.h b/modules/desktop_capture/x11/x_error_trap.h
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_error_trap.h
rename to modules/desktop_capture/x11/x_error_trap.h
diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/modules/desktop_capture/x11/x_server_pixel_buffer.cc
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc
rename to modules/desktop_capture/x11/x_server_pixel_buffer.cc
diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h b/modules/desktop_capture/x11/x_server_pixel_buffer.h
similarity index 100%
rename from webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h
rename to modules/desktop_capture/x11/x_server_pixel_buffer.h
diff --git a/webrtc/modules/include/DEPS b/modules/include/DEPS
similarity index 100%
rename from webrtc/modules/include/DEPS
rename to modules/include/DEPS
diff --git a/webrtc/modules/include/module.h b/modules/include/module.h
similarity index 100%
rename from webrtc/modules/include/module.h
rename to modules/include/module.h
diff --git a/webrtc/modules/include/module_common_types.h b/modules/include/module_common_types.h
similarity index 100%
rename from webrtc/modules/include/module_common_types.h
rename to modules/include/module_common_types.h
diff --git a/webrtc/modules/media_file/BUILD.gn b/modules/media_file/BUILD.gn
similarity index 100%
rename from webrtc/modules/media_file/BUILD.gn
rename to modules/media_file/BUILD.gn
diff --git a/webrtc/modules/media_file/DEPS b/modules/media_file/DEPS
similarity index 100%
rename from webrtc/modules/media_file/DEPS
rename to modules/media_file/DEPS
diff --git a/webrtc/modules/media_file/OWNERS b/modules/media_file/OWNERS
similarity index 100%
rename from webrtc/modules/media_file/OWNERS
rename to modules/media_file/OWNERS
diff --git a/webrtc/modules/media_file/media_file.h b/modules/media_file/media_file.h
similarity index 100%
rename from webrtc/modules/media_file/media_file.h
rename to modules/media_file/media_file.h
diff --git a/webrtc/modules/media_file/media_file_defines.h b/modules/media_file/media_file_defines.h
similarity index 100%
rename from webrtc/modules/media_file/media_file_defines.h
rename to modules/media_file/media_file_defines.h
diff --git a/webrtc/modules/media_file/media_file_impl.cc b/modules/media_file/media_file_impl.cc
similarity index 100%
rename from webrtc/modules/media_file/media_file_impl.cc
rename to modules/media_file/media_file_impl.cc
diff --git a/webrtc/modules/media_file/media_file_impl.h b/modules/media_file/media_file_impl.h
similarity index 100%
rename from webrtc/modules/media_file/media_file_impl.h
rename to modules/media_file/media_file_impl.h
diff --git a/webrtc/modules/media_file/media_file_unittest.cc b/modules/media_file/media_file_unittest.cc
similarity index 100%
rename from webrtc/modules/media_file/media_file_unittest.cc
rename to modules/media_file/media_file_unittest.cc
diff --git a/webrtc/modules/media_file/media_file_utility.cc b/modules/media_file/media_file_utility.cc
similarity index 100%
rename from webrtc/modules/media_file/media_file_utility.cc
rename to modules/media_file/media_file_utility.cc
diff --git a/webrtc/modules/media_file/media_file_utility.h b/modules/media_file/media_file_utility.h
similarity index 100%
rename from webrtc/modules/media_file/media_file_utility.h
rename to modules/media_file/media_file_utility.h
diff --git a/webrtc/modules/module_common_types_unittest.cc b/modules/module_common_types_unittest.cc
similarity index 100%
rename from webrtc/modules/module_common_types_unittest.cc
rename to modules/module_common_types_unittest.cc
diff --git a/webrtc/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
similarity index 100%
rename from webrtc/modules/pacing/BUILD.gn
rename to modules/pacing/BUILD.gn
diff --git a/webrtc/modules/pacing/DEPS b/modules/pacing/DEPS
similarity index 100%
rename from webrtc/modules/pacing/DEPS
rename to modules/pacing/DEPS
diff --git a/webrtc/modules/pacing/OWNERS b/modules/pacing/OWNERS
similarity index 100%
rename from webrtc/modules/pacing/OWNERS
rename to modules/pacing/OWNERS
diff --git a/webrtc/modules/pacing/alr_detector.cc b/modules/pacing/alr_detector.cc
similarity index 100%
rename from webrtc/modules/pacing/alr_detector.cc
rename to modules/pacing/alr_detector.cc
diff --git a/webrtc/modules/pacing/alr_detector.h b/modules/pacing/alr_detector.h
similarity index 100%
rename from webrtc/modules/pacing/alr_detector.h
rename to modules/pacing/alr_detector.h
diff --git a/webrtc/modules/pacing/alr_detector_unittest.cc b/modules/pacing/alr_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/pacing/alr_detector_unittest.cc
rename to modules/pacing/alr_detector_unittest.cc
diff --git a/webrtc/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc
similarity index 100%
rename from webrtc/modules/pacing/bitrate_prober.cc
rename to modules/pacing/bitrate_prober.cc
diff --git a/webrtc/modules/pacing/bitrate_prober.h b/modules/pacing/bitrate_prober.h
similarity index 100%
rename from webrtc/modules/pacing/bitrate_prober.h
rename to modules/pacing/bitrate_prober.h
diff --git a/webrtc/modules/pacing/bitrate_prober_unittest.cc b/modules/pacing/bitrate_prober_unittest.cc
similarity index 100%
rename from webrtc/modules/pacing/bitrate_prober_unittest.cc
rename to modules/pacing/bitrate_prober_unittest.cc
diff --git a/webrtc/modules/pacing/interval_budget.cc b/modules/pacing/interval_budget.cc
similarity index 100%
rename from webrtc/modules/pacing/interval_budget.cc
rename to modules/pacing/interval_budget.cc
diff --git a/webrtc/modules/pacing/interval_budget.h b/modules/pacing/interval_budget.h
similarity index 100%
rename from webrtc/modules/pacing/interval_budget.h
rename to modules/pacing/interval_budget.h
diff --git a/webrtc/modules/pacing/interval_budget_unittest.cc b/modules/pacing/interval_budget_unittest.cc
similarity index 100%
rename from webrtc/modules/pacing/interval_budget_unittest.cc
rename to modules/pacing/interval_budget_unittest.cc
diff --git a/webrtc/modules/pacing/mock/mock_paced_sender.h b/modules/pacing/mock/mock_paced_sender.h
similarity index 100%
rename from webrtc/modules/pacing/mock/mock_paced_sender.h
rename to modules/pacing/mock/mock_paced_sender.h
diff --git a/webrtc/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc
similarity index 100%
rename from webrtc/modules/pacing/paced_sender.cc
rename to modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h
similarity index 100%
rename from webrtc/modules/pacing/paced_sender.h
rename to modules/pacing/paced_sender.h
diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc
similarity index 100%
rename from webrtc/modules/pacing/paced_sender_unittest.cc
rename to modules/pacing/paced_sender_unittest.cc
diff --git a/webrtc/modules/pacing/pacer.h b/modules/pacing/pacer.h
similarity index 100%
rename from webrtc/modules/pacing/pacer.h
rename to modules/pacing/pacer.h
diff --git a/webrtc/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc
similarity index 100%
rename from webrtc/modules/pacing/packet_router.cc
rename to modules/pacing/packet_router.cc
diff --git a/webrtc/modules/pacing/packet_router.h b/modules/pacing/packet_router.h
similarity index 100%
rename from webrtc/modules/pacing/packet_router.h
rename to modules/pacing/packet_router.h
diff --git a/webrtc/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
similarity index 100%
rename from webrtc/modules/pacing/packet_router_unittest.cc
rename to modules/pacing/packet_router_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/BUILD.gn
rename to modules/remote_bitrate_estimator/BUILD.gn
diff --git a/webrtc/modules/remote_bitrate_estimator/DEPS b/modules/remote_bitrate_estimator/DEPS
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/DEPS
rename to modules/remote_bitrate_estimator/DEPS
diff --git a/webrtc/modules/remote_bitrate_estimator/OWNERS b/modules/remote_bitrate_estimator/OWNERS
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/OWNERS
rename to modules/remote_bitrate_estimator/OWNERS
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
rename to modules/remote_bitrate_estimator/aimd_rate_control.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/modules/remote_bitrate_estimator/aimd_rate_control.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
rename to modules/remote_bitrate_estimator/aimd_rate_control.h
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc b/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
rename to modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_defines.cc b/modules/remote_bitrate_estimator/bwe_defines.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/bwe_defines.cc
rename to modules/remote_bitrate_estimator/bwe_defines.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
rename to modules/remote_bitrate_estimator/bwe_simulations.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
rename to modules/remote_bitrate_estimator/include/bwe_defines.h
diff --git a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
rename to modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
diff --git a/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h b/modules/remote_bitrate_estimator/include/send_time_history.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/include/send_time_history.h
rename to modules/remote_bitrate_estimator/include/send_time_history.h
diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc b/modules/remote_bitrate_estimator/inter_arrival.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/inter_arrival.cc
rename to modules/remote_bitrate_estimator/inter_arrival.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h b/modules/remote_bitrate_estimator/inter_arrival.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/inter_arrival.h
rename to modules/remote_bitrate_estimator/inter_arrival.h
diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
rename to modules/remote_bitrate_estimator/inter_arrival_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc b/modules/remote_bitrate_estimator/overuse_detector.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
rename to modules/remote_bitrate_estimator/overuse_detector.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/overuse_detector.h
rename to modules/remote_bitrate_estimator/overuse_detector.h
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
rename to modules/remote_bitrate_estimator/overuse_detector_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc b/modules/remote_bitrate_estimator/overuse_estimator.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc
rename to modules/remote_bitrate_estimator/overuse_estimator.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h b/modules/remote_bitrate_estimator/overuse_estimator.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
rename to modules/remote_bitrate_estimator/overuse_estimator.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
rename to modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
rename to modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc
rename to modules/remote_bitrate_estimator/remote_estimator_proxy.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/modules/remote_bitrate_estimator/remote_estimator_proxy.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h
rename to modules/remote_bitrate_estimator/remote_estimator_proxy.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
rename to modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history.cc b/modules/remote_bitrate_estimator/send_time_history.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/send_time_history.cc
rename to modules/remote_bitrate_estimator/send_time_history.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
rename to modules/remote_bitrate_estimator/send_time_history_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc b/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc
rename to modules/remote_bitrate_estimator/test/bbr_paced_sender.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.h b/modules/remote_bitrate_estimator/test/bbr_paced_sender.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.h
rename to modules/remote_bitrate_estimator/test/bbr_paced_sender.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc b/modules/remote_bitrate_estimator/test/bwe.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe.cc
rename to modules/remote_bitrate_estimator/test/bwe.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.h b/modules/remote_bitrate_estimator/test/bwe.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe.h
rename to modules/remote_bitrate_estimator/test/bwe.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc b/modules/remote_bitrate_estimator/test/bwe_test.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc
rename to modules/remote_bitrate_estimator/test/bwe_test.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test.h
rename to modules/remote_bitrate_estimator/test/bwe_test.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
rename to modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h
rename to modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
rename to modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
rename to modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
rename to modules/remote_bitrate_estimator/test/bwe_test_framework.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/modules/remote_bitrate_estimator/test/bwe_test_framework.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
rename to modules/remote_bitrate_estimator/test/bwe_test_framework.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
rename to modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc b/modules/remote_bitrate_estimator/test/bwe_test_logging.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc
rename to modules/remote_bitrate_estimator/test/bwe_test_logging.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
rename to modules/remote_bitrate_estimator/test/bwe_test_logging.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc
rename to modules/remote_bitrate_estimator/test/bwe_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc b/modules/remote_bitrate_estimator/test/estimators/bbr.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc
rename to modules/remote_bitrate_estimator/test/estimators/bbr.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h b/modules/remote_bitrate_estimator/test/estimators/bbr.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h
rename to modules/remote_bitrate_estimator/test/estimators/bbr.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc b/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc
rename to modules/remote_bitrate_estimator/test/estimators/congestion_window.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h b/modules/remote_bitrate_estimator/test/estimators/congestion_window.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h
rename to modules/remote_bitrate_estimator/test/estimators/congestion_window.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc
rename to modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc
rename to modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h
rename to modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc
rename to modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h
rename to modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc
rename to modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc b/modules/remote_bitrate_estimator/test/estimators/nada.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc
rename to modules/remote_bitrate_estimator/test/estimators/nada.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h b/modules/remote_bitrate_estimator/test/estimators/nada.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h
rename to modules/remote_bitrate_estimator/test/estimators/nada.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
rename to modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc b/modules/remote_bitrate_estimator/test/estimators/remb.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
rename to modules/remote_bitrate_estimator/test/estimators/remb.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h b/modules/remote_bitrate_estimator/test/estimators/remb.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h
rename to modules/remote_bitrate_estimator/test/estimators/remb.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/modules/remote_bitrate_estimator/test/estimators/send_side.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
rename to modules/remote_bitrate_estimator/test/estimators/send_side.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h b/modules/remote_bitrate_estimator/test/estimators/send_side.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
rename to modules/remote_bitrate_estimator/test/estimators/send_side.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc b/modules/remote_bitrate_estimator/test/estimators/tcp.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc
rename to modules/remote_bitrate_estimator/test/estimators/tcp.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h b/modules/remote_bitrate_estimator/test/estimators/tcp.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h
rename to modules/remote_bitrate_estimator/test/estimators/tcp.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.cc b/modules/remote_bitrate_estimator/test/metric_recorder.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/metric_recorder.cc
rename to modules/remote_bitrate_estimator/test/metric_recorder.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h b/modules/remote_bitrate_estimator/test/metric_recorder.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h
rename to modules/remote_bitrate_estimator/test/metric_recorder.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
rename to modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet.h b/modules/remote_bitrate_estimator/test/packet.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/packet.h
rename to modules/remote_bitrate_estimator/test/packet.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc b/modules/remote_bitrate_estimator/test/packet_receiver.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc
rename to modules/remote_bitrate_estimator/test/packet_receiver.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h b/modules/remote_bitrate_estimator/test/packet_receiver.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
rename to modules/remote_bitrate_estimator/test/packet_receiver.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc b/modules/remote_bitrate_estimator/test/packet_sender.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc
rename to modules/remote_bitrate_estimator/test/packet_sender.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h b/modules/remote_bitrate_estimator/test/packet_sender.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/packet_sender.h
rename to modules/remote_bitrate_estimator/test/packet_sender.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/plot_bars.sh b/modules/remote_bitrate_estimator/test/plot_bars.sh
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/plot_bars.sh
rename to modules/remote_bitrate_estimator/test/plot_bars.sh
diff --git a/webrtc/modules/remote_bitrate_estimator/test/plot_dynamics.py b/modules/remote_bitrate_estimator/test/plot_dynamics.py
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/test/plot_dynamics.py
rename to modules/remote_bitrate_estimator/test/plot_dynamics.py
diff --git a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
rename to modules/remote_bitrate_estimator/tools/bwe_rtp.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h b/modules/remote_bitrate_estimator/tools/bwe_rtp.h
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h
rename to modules/remote_bitrate_estimator/tools/bwe_rtp.h
diff --git a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc
rename to modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
similarity index 100%
rename from webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
rename to modules/remote_bitrate_estimator/tools/rtp_to_text.cc
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
similarity index 100%
rename from webrtc/modules/rtp_rtcp/BUILD.gn
rename to modules/rtp_rtcp/BUILD.gn
diff --git a/webrtc/modules/rtp_rtcp/DEPS b/modules/rtp_rtcp/DEPS
similarity index 100%
rename from webrtc/modules/rtp_rtcp/DEPS
rename to modules/rtp_rtcp/DEPS
diff --git a/webrtc/modules/rtp_rtcp/OWNERS b/modules/rtp_rtcp/OWNERS
similarity index 100%
rename from webrtc/modules/rtp_rtcp/OWNERS
rename to modules/rtp_rtcp/OWNERS
diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h b/modules/rtp_rtcp/include/flexfec_receiver.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/flexfec_receiver.h
rename to modules/rtp_rtcp/include/flexfec_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/flexfec_sender.h
rename to modules/rtp_rtcp/include/flexfec_sender.h
diff --git a/webrtc/modules/rtp_rtcp/include/receive_statistics.h b/modules/rtp_rtcp/include/receive_statistics.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/receive_statistics.h
rename to modules/rtp_rtcp/include/receive_statistics.h
diff --git a/webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h
rename to modules/rtp_rtcp/include/remote_ntp_time_estimator.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_cvo.h b/modules/rtp_rtcp/include/rtp_cvo.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_cvo.h
rename to modules/rtp_rtcp/include/rtp_cvo.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h
rename to modules/rtp_rtcp/include/rtp_header_extension_map.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_header_parser.h b/modules/rtp_rtcp/include/rtp_header_parser.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_header_parser.h
rename to modules/rtp_rtcp/include/rtp_header_parser.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/modules/rtp_rtcp/include/rtp_payload_registry.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
rename to modules/rtp_rtcp/include/rtp_payload_registry.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_receiver.h b/modules/rtp_rtcp/include/rtp_receiver.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_receiver.h
rename to modules/rtp_rtcp/include/rtp_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
rename to modules/rtp_rtcp/include/rtp_rtcp.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
rename to modules/rtp_rtcp/include/rtp_rtcp_defines.h
diff --git a/webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h b/modules/rtp_rtcp/include/ulpfec_receiver.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h
rename to modules/rtp_rtcp/include/ulpfec_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
rename to modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h b/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h
rename to modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
rename to modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
diff --git a/webrtc/modules/rtp_rtcp/source/byte_io.h b/modules/rtp_rtcp/source/byte_io.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/byte_io.h
rename to modules/rtp_rtcp/source/byte_io.h
diff --git a/webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc
rename to modules/rtp_rtcp/source/byte_io_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/dtmf_queue.cc b/modules/rtp_rtcp/source/dtmf_queue.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/dtmf_queue.cc
rename to modules/rtp_rtcp/source/dtmf_queue.cc
diff --git a/webrtc/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/dtmf_queue.h
rename to modules/rtp_rtcp/source/dtmf_queue.h
diff --git a/webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h b/modules/rtp_rtcp/source/fec_private_tables_bursty.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h
rename to modules/rtp_rtcp/source/fec_private_tables_bursty.h
diff --git a/webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h b/modules/rtp_rtcp/source/fec_private_tables_random.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h
rename to modules/rtp_rtcp/source/fec_private_tables_random.h
diff --git a/webrtc/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/fec_test_helper.cc
rename to modules/rtp_rtcp/source/fec_test_helper.cc
diff --git a/webrtc/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/fec_test_helper.h
rename to modules/rtp_rtcp/source/fec_test_helper.h
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
rename to modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
rename to modules/rtp_rtcp/source/flexfec_header_reader_writer.h
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
rename to modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc
rename to modules/rtp_rtcp/source/flexfec_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
rename to modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_sender.cc
rename to modules/rtp_rtcp/source/flexfec_sender.cc
diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
rename to modules/rtp_rtcp/source/flexfec_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
rename to modules/rtp_rtcp/source/forward_error_correction.cc
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/forward_error_correction.h
rename to modules/rtp_rtcp/source/forward_error_correction.h
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc
rename to modules/rtp_rtcp/source/forward_error_correction_internal.cc
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h b/modules/rtp_rtcp/source/forward_error_correction_internal.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h
rename to modules/rtp_rtcp/source/forward_error_correction_internal.h
diff --git a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc
rename to modules/rtp_rtcp/source/nack_rtx_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc b/modules/rtp_rtcp/source/packet_loss_stats.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc
rename to modules/rtp_rtcp/source/packet_loss_stats.cc
diff --git a/webrtc/modules/rtp_rtcp/source/packet_loss_stats.h b/modules/rtp_rtcp/source/packet_loss_stats.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/packet_loss_stats.h
rename to modules/rtp_rtcp/source/packet_loss_stats.h
diff --git a/webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
rename to modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc b/modules/rtp_rtcp/source/playout_delay_oracle.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc
rename to modules/rtp_rtcp/source/playout_delay_oracle.cc
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/modules/rtp_rtcp/source/playout_delay_oracle.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
rename to modules/rtp_rtcp/source/playout_delay_oracle.h
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
rename to modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/modules/rtp_rtcp/source/receive_statistics_impl.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
rename to modules/rtp_rtcp/source/receive_statistics_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
rename to modules/rtp_rtcp/source/receive_statistics_impl.h
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc
rename to modules/rtp_rtcp/source/receive_statistics_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc
rename to modules/rtp_rtcp/source/remote_ntp_time_estimator.cc
diff --git a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
rename to modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.cc b/modules/rtp_rtcp/source/rtcp_nack_stats.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.cc
rename to modules/rtp_rtcp/source/rtcp_nack_stats.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h b/modules/rtp_rtcp/source/rtcp_nack_stats.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h
rename to modules/rtp_rtcp/source/rtcp_nack_stats.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc b/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/modules/rtp_rtcp/source/rtcp_packet.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
rename to modules/rtp_rtcp/source/rtcp_packet.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet.h
rename to modules/rtp_rtcp/source/rtcp_packet.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc b/modules/rtp_rtcp/source/rtcp_packet/app.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc
rename to modules/rtp_rtcp/source/rtcp_packet/app.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h b/modules/rtp_rtcp/source/rtcp_packet/app.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h
rename to modules/rtp_rtcp/source/rtcp_packet/app.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/modules/rtp_rtcp/source/rtcp_packet/bye.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc
rename to modules/rtp_rtcp/source/rtcp_packet/bye.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h b/modules/rtp_rtcp/source/rtcp_packet/bye.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h
rename to modules/rtp_rtcp/source/rtcp_packet/bye.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc b/modules/rtp_rtcp/source/rtcp_packet/common_header.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc
rename to modules/rtp_rtcp/source/rtcp_packet/common_header.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h b/modules/rtp_rtcp/source/rtcp_packet/common_header.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h
rename to modules/rtp_rtcp/source/rtcp_packet/common_header.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc
rename to modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
rename to modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
rename to modules/rtp_rtcp/source/rtcp_packet/dlrr.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h b/modules/rtp_rtcp/source/rtcp_packet/dlrr.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h
rename to modules/rtp_rtcp/source/rtcp_packet/dlrr.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc
rename to modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h
rename to modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc
rename to modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h
rename to modules/rtp_rtcp/source/rtcp_packet/extended_reports.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc b/modules/rtp_rtcp/source/rtcp_packet/fir.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc
rename to modules/rtp_rtcp/source/rtcp_packet/fir.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h b/modules/rtp_rtcp/source/rtcp_packet/fir.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h
rename to modules/rtp_rtcp/source/rtcp_packet/fir.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc b/modules/rtp_rtcp/source/rtcp_packet/nack.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc
rename to modules/rtp_rtcp/source/rtcp_packet/nack.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h b/modules/rtp_rtcp/source/rtcp_packet/nack.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h
rename to modules/rtp_rtcp/source/rtcp_packet/nack.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc b/modules/rtp_rtcp/source/rtcp_packet/pli.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc
rename to modules/rtp_rtcp/source/rtcp_packet/pli.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h b/modules/rtp_rtcp/source/rtcp_packet/pli.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h
rename to modules/rtp_rtcp/source/rtcp_packet/pli.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.cc b/modules/rtp_rtcp/source/rtcp_packet/psfb.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.cc
rename to modules/rtp_rtcp/source/rtcp_packet/psfb.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h b/modules/rtp_rtcp/source/rtcp_packet/psfb.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h
rename to modules/rtp_rtcp/source/rtcp_packet/psfb.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc
rename to modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
rename to modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc
rename to modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
rename to modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc b/modules/rtp_rtcp/source/rtcp_packet/remb.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc
rename to modules/rtp_rtcp/source/rtcp_packet/remb.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h b/modules/rtp_rtcp/source/rtcp_packet/remb.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h
rename to modules/rtp_rtcp/source/rtcp_packet/remb.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc
rename to modules/rtp_rtcp/source/rtcp_packet/report_block.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h b/modules/rtp_rtcp/source/rtcp_packet/report_block.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h
rename to modules/rtp_rtcp/source/rtcp_packet/report_block.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc b/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc
rename to modules/rtp_rtcp/source/rtcp_packet/rrtr.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h
rename to modules/rtp_rtcp/source/rtcp_packet/rrtr.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc
rename to modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
rename to modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
rename to modules/rtp_rtcp/source/rtcp_packet/sdes.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/modules/rtp_rtcp/source/rtcp_packet/sdes.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h
rename to modules/rtp_rtcp/source/rtcp_packet/sdes.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc
rename to modules/rtp_rtcp/source/rtcp_packet/sender_report.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h b/modules/rtp_rtcp/source/rtcp_packet/sender_report.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h
rename to modules/rtp_rtcp/source/rtcp_packet/sender_report.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
rename to modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
rename to modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc
rename to modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
rename to modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
rename to modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h
rename to modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc
rename to modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
rename to modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
rename to modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
rename to modules/rtp_rtcp/source/rtcp_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
rename to modules/rtp_rtcp/source/rtcp_sender.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_sender.h
rename to modules/rtp_rtcp/source/rtcp_sender.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
rename to modules/rtp_rtcp/source/rtcp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
rename to modules/rtp_rtcp/source/rtp_fec_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format.cc b/modules/rtp_rtcp/source/rtp_format.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format.cc
rename to modules/rtp_rtcp/source/rtp_format.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format.h
rename to modules/rtp_rtcp/source/rtp_format.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
rename to modules/rtp_rtcp/source/rtp_format_h264.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
rename to modules/rtp_rtcp/source/rtp_format_h264.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
rename to modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc
rename to modules/rtp_rtcp/source/rtp_format_video_generic.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h
rename to modules/rtp_rtcp/source/rtp_format_video_generic.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
rename to modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc
rename to modules/rtp_rtcp/source/rtp_format_vp8.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h
rename to modules/rtp_rtcp/source/rtp_format_vp8.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
rename to modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
rename to modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
rename to modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc
rename to modules/rtp_rtcp/source/rtp_format_vp9.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h
rename to modules/rtp_rtcp/source/rtp_format_vp9.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
rename to modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/modules/rtp_rtcp/source/rtp_header_extension_map.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc
rename to modules/rtp_rtcp/source/rtp_header_extension_map.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc
rename to modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
rename to modules/rtp_rtcp/source/rtp_header_extensions.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
rename to modules/rtp_rtcp/source/rtp_header_extensions.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc
rename to modules/rtp_rtcp/source/rtp_header_parser.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet.cc
rename to modules/rtp_rtcp/source/rtp_packet.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet.h
rename to modules/rtp_rtcp/source/rtp_packet.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc
rename to modules/rtp_rtcp/source/rtp_packet_history.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_history.h
rename to modules/rtp_rtcp/source/rtp_packet_history.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
rename to modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_received.cc
rename to modules/rtp_rtcp/source/rtp_packet_received.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_received.h
rename to modules/rtp_rtcp/source/rtp_packet_received.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h
rename to modules/rtp_rtcp/source/rtp_packet_to_send.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
rename to modules/rtp_rtcp/source/rtp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
rename to modules/rtp_rtcp/source/rtp_payload_registry.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
rename to modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/modules/rtp_rtcp/source/rtp_receiver_audio.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc
rename to modules/rtp_rtcp/source/rtp_receiver_audio.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h b/modules/rtp_rtcp/source/rtp_receiver_audio.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h
rename to modules/rtp_rtcp/source/rtp_receiver_audio.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/modules/rtp_rtcp/source/rtp_receiver_impl.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
rename to modules/rtp_rtcp/source/rtp_receiver_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h b/modules/rtp_rtcp/source/rtp_receiver_impl.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h
rename to modules/rtp_rtcp/source/rtp_receiver_impl.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc b/modules/rtp_rtcp/source/rtp_receiver_strategy.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc
rename to modules/rtp_rtcp/source/rtp_receiver_strategy.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h b/modules/rtp_rtcp/source/rtp_receiver_strategy.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h
rename to modules/rtp_rtcp/source/rtp_receiver_strategy.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
rename to modules/rtp_rtcp/source/rtp_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/modules/rtp_rtcp/source/rtp_receiver_video.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc
rename to modules/rtp_rtcp/source/rtp_receiver_video.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h b/modules/rtp_rtcp/source/rtp_receiver_video.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h
rename to modules/rtp_rtcp/source/rtp_receiver_video.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h b/modules/rtp_rtcp/source/rtp_rtcp_config.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h
rename to modules/rtp_rtcp/source/rtp_rtcp_config.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
rename to modules/rtp_rtcp/source/rtp_rtcp_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
rename to modules/rtp_rtcp/source/rtp_rtcp_impl.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
rename to modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender.cc
rename to modules/rtp_rtcp/source/rtp_sender.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender.h
rename to modules/rtp_rtcp/source/rtp_sender.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
rename to modules/rtp_rtcp/source/rtp_sender_audio.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h
rename to modules/rtp_rtcp/source/rtp_sender_audio.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
rename to modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
rename to modules/rtp_rtcp/source/rtp_sender_video.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_sender_video.h
rename to modules/rtp_rtcp/source/rtp_sender_video.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_utility.cc
rename to modules/rtp_rtcp/source/rtp_utility.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_utility.h
rename to modules/rtp_rtcp/source/rtp_utility.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc b/modules/rtp_rtcp/source/rtp_utility_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc
rename to modules/rtp_rtcp/source/rtp_utility_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/time_util.cc b/modules/rtp_rtcp/source/time_util.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/time_util.cc
rename to modules/rtp_rtcp/source/time_util.cc
diff --git a/webrtc/modules/rtp_rtcp/source/time_util.h b/modules/rtp_rtcp/source/time_util.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/time_util.h
rename to modules/rtp_rtcp/source/time_util.h
diff --git a/webrtc/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/time_util_unittest.cc
rename to modules/rtp_rtcp/source/time_util_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
rename to modules/rtp_rtcp/source/tmmbr_help.cc
diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/tmmbr_help.h
rename to modules/rtp_rtcp/source/tmmbr_help.h
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc
rename to modules/rtp_rtcp/source/ulpfec_generator.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_generator.h b/modules/rtp_rtcp/source/ulpfec_generator.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_generator.h
rename to modules/rtp_rtcp/source/ulpfec_generator.h
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
rename to modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
rename to modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
rename to modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
rename to modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
rename to modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
rename to modules/rtp_rtcp/source/ulpfec_receiver_impl.h
diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
rename to modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/video_codec_information.h b/modules/rtp_rtcp/source/video_codec_information.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/source/video_codec_information.h
rename to modules/rtp_rtcp/source/video_codec_information.h
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc b/modules/rtp_rtcp/test/testAPI/test_api.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc
rename to modules/rtp_rtcp/test/testAPI/test_api.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h b/modules/rtp_rtcp/test/testAPI/test_api.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testAPI/test_api.h
rename to modules/rtp_rtcp/test/testAPI/test_api.h
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
rename to modules/rtp_rtcp/test/testAPI/test_api_audio.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
rename to modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/modules/rtp_rtcp/test/testAPI/test_api_video.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc
rename to modules/rtp_rtcp/test/testAPI/test_api_video.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h b/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h
rename to modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h
diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc
rename to modules/rtp_rtcp/test/testFec/test_fec.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
similarity index 100%
rename from webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
rename to modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
diff --git a/webrtc/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
similarity index 100%
rename from webrtc/modules/utility/BUILD.gn
rename to modules/utility/BUILD.gn
diff --git a/webrtc/modules/utility/DEPS b/modules/utility/DEPS
similarity index 100%
rename from webrtc/modules/utility/DEPS
rename to modules/utility/DEPS
diff --git a/webrtc/modules/utility/OWNERS b/modules/utility/OWNERS
similarity index 100%
rename from webrtc/modules/utility/OWNERS
rename to modules/utility/OWNERS
diff --git a/webrtc/modules/utility/include/audio_frame_operations.h b/modules/utility/include/audio_frame_operations.h
similarity index 100%
rename from webrtc/modules/utility/include/audio_frame_operations.h
rename to modules/utility/include/audio_frame_operations.h
diff --git a/webrtc/modules/utility/include/helpers_android.h b/modules/utility/include/helpers_android.h
similarity index 100%
rename from webrtc/modules/utility/include/helpers_android.h
rename to modules/utility/include/helpers_android.h
diff --git a/webrtc/modules/utility/include/jvm_android.h b/modules/utility/include/jvm_android.h
similarity index 100%
rename from webrtc/modules/utility/include/jvm_android.h
rename to modules/utility/include/jvm_android.h
diff --git a/webrtc/modules/utility/include/mock/mock_process_thread.h b/modules/utility/include/mock/mock_process_thread.h
similarity index 100%
rename from webrtc/modules/utility/include/mock/mock_process_thread.h
rename to modules/utility/include/mock/mock_process_thread.h
diff --git a/webrtc/modules/utility/include/process_thread.h b/modules/utility/include/process_thread.h
similarity index 100%
rename from webrtc/modules/utility/include/process_thread.h
rename to modules/utility/include/process_thread.h
diff --git a/webrtc/modules/utility/source/helpers_android.cc b/modules/utility/source/helpers_android.cc
similarity index 100%
rename from webrtc/modules/utility/source/helpers_android.cc
rename to modules/utility/source/helpers_android.cc
diff --git a/webrtc/modules/utility/source/jvm_android.cc b/modules/utility/source/jvm_android.cc
similarity index 100%
rename from webrtc/modules/utility/source/jvm_android.cc
rename to modules/utility/source/jvm_android.cc
diff --git a/webrtc/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc
similarity index 100%
rename from webrtc/modules/utility/source/process_thread_impl.cc
rename to modules/utility/source/process_thread_impl.cc
diff --git a/webrtc/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h
similarity index 100%
rename from webrtc/modules/utility/source/process_thread_impl.h
rename to modules/utility/source/process_thread_impl.h
diff --git a/webrtc/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/utility/source/process_thread_impl_unittest.cc
rename to modules/utility/source/process_thread_impl_unittest.cc
diff --git a/webrtc/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
similarity index 100%
rename from webrtc/modules/video_capture/BUILD.gn
rename to modules/video_capture/BUILD.gn
diff --git a/webrtc/modules/video_capture/DEPS b/modules/video_capture/DEPS
similarity index 100%
rename from webrtc/modules/video_capture/DEPS
rename to modules/video_capture/DEPS
diff --git a/webrtc/modules/video_capture/OWNERS b/modules/video_capture/OWNERS
similarity index 100%
rename from webrtc/modules/video_capture/OWNERS
rename to modules/video_capture/OWNERS
diff --git a/webrtc/modules/video_capture/device_info_impl.cc b/modules/video_capture/device_info_impl.cc
similarity index 100%
rename from webrtc/modules/video_capture/device_info_impl.cc
rename to modules/video_capture/device_info_impl.cc
diff --git a/webrtc/modules/video_capture/device_info_impl.h b/modules/video_capture/device_info_impl.h
similarity index 100%
rename from webrtc/modules/video_capture/device_info_impl.h
rename to modules/video_capture/device_info_impl.h
diff --git a/webrtc/modules/video_capture/external/device_info_external.cc b/modules/video_capture/external/device_info_external.cc
similarity index 100%
rename from webrtc/modules/video_capture/external/device_info_external.cc
rename to modules/video_capture/external/device_info_external.cc
diff --git a/webrtc/modules/video_capture/external/video_capture_external.cc b/modules/video_capture/external/video_capture_external.cc
similarity index 100%
rename from webrtc/modules/video_capture/external/video_capture_external.cc
rename to modules/video_capture/external/video_capture_external.cc
diff --git a/webrtc/modules/video_capture/linux/device_info_linux.cc b/modules/video_capture/linux/device_info_linux.cc
similarity index 100%
rename from webrtc/modules/video_capture/linux/device_info_linux.cc
rename to modules/video_capture/linux/device_info_linux.cc
diff --git a/webrtc/modules/video_capture/linux/device_info_linux.h b/modules/video_capture/linux/device_info_linux.h
similarity index 100%
rename from webrtc/modules/video_capture/linux/device_info_linux.h
rename to modules/video_capture/linux/device_info_linux.h
diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc
similarity index 100%
rename from webrtc/modules/video_capture/linux/video_capture_linux.cc
rename to modules/video_capture/linux/video_capture_linux.cc
diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h
similarity index 100%
rename from webrtc/modules/video_capture/linux/video_capture_linux.h
rename to modules/video_capture/linux/video_capture_linux.h
diff --git a/webrtc/modules/video_capture/objc/device_info.h b/modules/video_capture/objc/device_info.h
similarity index 100%
rename from webrtc/modules/video_capture/objc/device_info.h
rename to modules/video_capture/objc/device_info.h
diff --git a/webrtc/modules/video_capture/objc/device_info.mm b/modules/video_capture/objc/device_info.mm
similarity index 100%
rename from webrtc/modules/video_capture/objc/device_info.mm
rename to modules/video_capture/objc/device_info.mm
diff --git a/webrtc/modules/video_capture/objc/device_info_objc.h b/modules/video_capture/objc/device_info_objc.h
similarity index 100%
rename from webrtc/modules/video_capture/objc/device_info_objc.h
rename to modules/video_capture/objc/device_info_objc.h
diff --git a/webrtc/modules/video_capture/objc/device_info_objc.mm b/modules/video_capture/objc/device_info_objc.mm
similarity index 100%
rename from webrtc/modules/video_capture/objc/device_info_objc.mm
rename to modules/video_capture/objc/device_info_objc.mm
diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.h b/modules/video_capture/objc/rtc_video_capture_objc.h
similarity index 100%
rename from webrtc/modules/video_capture/objc/rtc_video_capture_objc.h
rename to modules/video_capture/objc/rtc_video_capture_objc.h
diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/modules/video_capture/objc/rtc_video_capture_objc.mm
similarity index 100%
rename from webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm
rename to modules/video_capture/objc/rtc_video_capture_objc.mm
diff --git a/webrtc/modules/video_capture/objc/video_capture.h b/modules/video_capture/objc/video_capture.h
similarity index 100%
rename from webrtc/modules/video_capture/objc/video_capture.h
rename to modules/video_capture/objc/video_capture.h
diff --git a/webrtc/modules/video_capture/objc/video_capture.mm b/modules/video_capture/objc/video_capture.mm
similarity index 100%
rename from webrtc/modules/video_capture/objc/video_capture.mm
rename to modules/video_capture/objc/video_capture.mm
diff --git a/webrtc/modules/video_capture/test/video_capture_main_mac.mm b/modules/video_capture/test/video_capture_main_mac.mm
similarity index 100%
rename from webrtc/modules/video_capture/test/video_capture_main_mac.mm
rename to modules/video_capture/test/video_capture_main_mac.mm
diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc
similarity index 100%
rename from webrtc/modules/video_capture/test/video_capture_unittest.cc
rename to modules/video_capture/test/video_capture_unittest.cc
diff --git a/webrtc/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h
similarity index 100%
rename from webrtc/modules/video_capture/video_capture.h
rename to modules/video_capture/video_capture.h
diff --git a/webrtc/modules/video_capture/video_capture_config.h b/modules/video_capture/video_capture_config.h
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_config.h
rename to modules/video_capture/video_capture_config.h
diff --git a/webrtc/modules/video_capture/video_capture_defines.h b/modules/video_capture/video_capture_defines.h
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_defines.h
rename to modules/video_capture/video_capture_defines.h
diff --git a/webrtc/modules/video_capture/video_capture_factory.cc b/modules/video_capture/video_capture_factory.cc
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_factory.cc
rename to modules/video_capture/video_capture_factory.cc
diff --git a/webrtc/modules/video_capture/video_capture_factory.h b/modules/video_capture/video_capture_factory.h
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_factory.h
rename to modules/video_capture/video_capture_factory.h
diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_impl.cc
rename to modules/video_capture/video_capture_impl.cc
diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h
similarity index 100%
rename from webrtc/modules/video_capture/video_capture_impl.h
rename to modules/video_capture/video_capture_impl.h
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/device_info_ds.cc
rename to modules/video_capture/windows/device_info_ds.cc
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.h b/modules/video_capture/windows/device_info_ds.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/device_info_ds.h
rename to modules/video_capture/windows/device_info_ds.h
diff --git a/webrtc/modules/video_capture/windows/device_info_mf.cc b/modules/video_capture/windows/device_info_mf.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/device_info_mf.cc
rename to modules/video_capture/windows/device_info_mf.cc
diff --git a/webrtc/modules/video_capture/windows/device_info_mf.h b/modules/video_capture/windows/device_info_mf.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/device_info_mf.h
rename to modules/video_capture/windows/device_info_mf.h
diff --git a/webrtc/modules/video_capture/windows/help_functions_ds.cc b/modules/video_capture/windows/help_functions_ds.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/help_functions_ds.cc
rename to modules/video_capture/windows/help_functions_ds.cc
diff --git a/webrtc/modules/video_capture/windows/help_functions_ds.h b/modules/video_capture/windows/help_functions_ds.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/help_functions_ds.h
rename to modules/video_capture/windows/help_functions_ds.h
diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/sink_filter_ds.cc
rename to modules/video_capture/windows/sink_filter_ds.cc
diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/sink_filter_ds.h
rename to modules/video_capture/windows/sink_filter_ds.h
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.cc b/modules/video_capture/windows/video_capture_ds.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/video_capture_ds.cc
rename to modules/video_capture/windows/video_capture_ds.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.h b/modules/video_capture/windows/video_capture_ds.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/video_capture_ds.h
rename to modules/video_capture/windows/video_capture_ds.h
diff --git a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
rename to modules/video_capture/windows/video_capture_factory_windows.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_mf.cc b/modules/video_capture/windows/video_capture_mf.cc
similarity index 100%
rename from webrtc/modules/video_capture/windows/video_capture_mf.cc
rename to modules/video_capture/windows/video_capture_mf.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_mf.h b/modules/video_capture/windows/video_capture_mf.h
similarity index 100%
rename from webrtc/modules/video_capture/windows/video_capture_mf.h
rename to modules/video_capture/windows/video_capture_mf.h
diff --git a/webrtc/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
similarity index 100%
rename from webrtc/modules/video_coding/BUILD.gn
rename to modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/DEPS b/modules/video_coding/DEPS
similarity index 100%
rename from webrtc/modules/video_coding/DEPS
rename to modules/video_coding/DEPS
diff --git a/webrtc/modules/video_coding/OWNERS b/modules/video_coding/OWNERS
similarity index 100%
rename from webrtc/modules/video_coding/OWNERS
rename to modules/video_coding/OWNERS
diff --git a/webrtc/modules/video_coding/codec_database.cc b/modules/video_coding/codec_database.cc
similarity index 100%
rename from webrtc/modules/video_coding/codec_database.cc
rename to modules/video_coding/codec_database.cc
diff --git a/webrtc/modules/video_coding/codec_database.h b/modules/video_coding/codec_database.h
similarity index 100%
rename from webrtc/modules/video_coding/codec_database.h
rename to modules/video_coding/codec_database.h
diff --git a/webrtc/modules/video_coding/codec_timer.cc b/modules/video_coding/codec_timer.cc
similarity index 100%
rename from webrtc/modules/video_coding/codec_timer.cc
rename to modules/video_coding/codec_timer.cc
diff --git a/webrtc/modules/video_coding/codec_timer.h b/modules/video_coding/codec_timer.h
similarity index 100%
rename from webrtc/modules/video_coding/codec_timer.h
rename to modules/video_coding/codec_timer.h
diff --git a/webrtc/modules/video_coding/codecs/h264/OWNERS b/modules/video_coding/codecs/h264/OWNERS
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/OWNERS
rename to modules/video_coding/codecs/h264/OWNERS
diff --git a/webrtc/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264.cc
rename to modules/video_coding/codecs/h264/h264.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
rename to modules/video_coding/codecs/h264/h264_decoder_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h b/modules/video_coding/codecs/h264/h264_decoder_impl.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
rename to modules/video_coding/codecs/h264/h264_decoder_impl.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
rename to modules/video_coding/codecs/h264/h264_encoder_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
rename to modules/video_coding/codecs/h264/h264_encoder_impl.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc b/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
rename to modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/include/h264.h b/modules/video_coding/codecs/h264/include/h264.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/include/h264.h
rename to modules/video_coding/codecs/h264/include/h264.h
diff --git a/webrtc/modules/video_coding/codecs/h264/include/h264_globals.h b/modules/video_coding/codecs/h264/include/h264_globals.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/include/h264_globals.h
rename to modules/video_coding/codecs/h264/include/h264_globals.h
diff --git a/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
rename to modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/i420/i420.cc b/modules/video_coding/codecs/i420/i420.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/i420/i420.cc
rename to modules/video_coding/codecs/i420/i420.cc
diff --git a/webrtc/modules/video_coding/codecs/i420/include/i420.h b/modules/video_coding/codecs/i420/include/i420.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/i420/include/i420.h
rename to modules/video_coding/codecs/i420/include/i420.h
diff --git a/webrtc/modules/video_coding/codecs/interface/common_constants.h b/modules/video_coding/codecs/interface/common_constants.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/interface/common_constants.h
rename to modules/video_coding/codecs/interface/common_constants.h
diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
rename to modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
diff --git a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h b/modules/video_coding/codecs/interface/video_codec_interface.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/interface/video_codec_interface.h
rename to modules/video_coding/codecs/interface/video_codec_interface.h
diff --git a/webrtc/modules/video_coding/codecs/interface/video_error_codes.h b/modules/video_coding/codecs/interface/video_error_codes.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/interface/video_error_codes.h
rename to modules/video_coding/codecs/interface/video_error_codes.h
diff --git a/webrtc/modules/video_coding/codecs/test/android_test_initializer.cc b/modules/video_coding/codecs/test/android_test_initializer.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/android_test_initializer.cc
rename to modules/video_coding/codecs/test/android_test_initializer.cc
diff --git a/webrtc/modules/video_coding/codecs/test/android_test_initializer.h b/modules/video_coding/codecs/test/android_test_initializer.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/android_test_initializer.h
rename to modules/video_coding/codecs/test/android_test_initializer.h
diff --git a/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h b/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
rename to modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
diff --git a/webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h b/modules/video_coding/codecs/test/objc_codec_h264_test.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h
rename to modules/video_coding/codecs/test/objc_codec_h264_test.h
diff --git a/webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.mm b/modules/video_coding/codecs/test/objc_codec_h264_test.mm
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.mm
rename to modules/video_coding/codecs/test/objc_codec_h264_test.mm
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/modules/video_coding/codecs/test/packet_manipulator.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/packet_manipulator.cc
rename to modules/video_coding/codecs/test/packet_manipulator.cc
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/modules/video_coding/codecs/test/packet_manipulator.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/packet_manipulator.h
rename to modules/video_coding/codecs/test/packet_manipulator.h
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
rename to modules/video_coding/codecs/test/packet_manipulator_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/test/plot_webrtc_test_logs.py b/modules/video_coding/codecs/test/plot_webrtc_test_logs.py
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/plot_webrtc_test_logs.py
rename to modules/video_coding/codecs/test/plot_webrtc_test_logs.py
diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc b/modules/video_coding/codecs/test/predictive_packet_manipulator.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc
rename to modules/video_coding/codecs/test/predictive_packet_manipulator.cc
diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h b/modules/video_coding/codecs/test/predictive_packet_manipulator.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h
rename to modules/video_coding/codecs/test/predictive_packet_manipulator.h
diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/modules/video_coding/codecs/test/stats.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/stats.cc
rename to modules/video_coding/codecs/test/stats.cc
diff --git a/webrtc/modules/video_coding/codecs/test/stats.h b/modules/video_coding/codecs/test/stats.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/stats.h
rename to modules/video_coding/codecs/test/stats.h
diff --git a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc b/modules/video_coding/codecs/test/stats_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/stats_unittest.cc
rename to modules/video_coding/codecs/test/stats_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/test/video_codec_test.cc b/modules/video_coding/codecs/test/video_codec_test.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/video_codec_test.cc
rename to modules/video_coding/codecs/test/video_codec_test.cc
diff --git a/webrtc/modules/video_coding/codecs/test/video_codec_test.h b/modules/video_coding/codecs/test/video_codec_test.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/video_codec_test.h
rename to modules/video_coding/codecs/test/video_codec_test.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor.cc
rename to modules/video_coding/codecs/test/videoprocessor.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor.h
rename to modules/video_coding/codecs/test/videoprocessor.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc
rename to modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc
rename to modules/video_coding/codecs/test/videoprocessor_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
rename to modules/video_coding/codecs/vp8/default_temporal_layers.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h b/modules/video_coding/codecs/vp8/default_temporal_layers.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
rename to modules/video_coding/codecs/vp8/default_temporal_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
rename to modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8.h b/modules/video_coding/codecs/vp8/include/vp8.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/include/vp8.h
rename to modules/video_coding/codecs/vp8/include/vp8.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h b/modules/video_coding/codecs/vp8/include/vp8_common_types.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h
rename to modules/video_coding/codecs/vp8/include/vp8_common_types.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8_globals.h b/modules/video_coding/codecs/vp8/include/vp8_globals.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/include/vp8_globals.h
rename to modules/video_coding/codecs/vp8/include/vp8_globals.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc
rename to modules/video_coding/codecs/vp8/screenshare_layers.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h
rename to modules/video_coding/codecs/vp8/screenshare_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
rename to modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
rename to modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
rename to modules/video_coding/codecs/vp8/simulcast_rate_allocator.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_test_utility.h b/modules/video_coding/codecs/vp8/simulcast_test_utility.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/simulcast_test_utility.h
rename to modules/video_coding/codecs/vp8/simulcast_test_utility.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.cc b/modules/video_coding/codecs/vp8/simulcast_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.cc
rename to modules/video_coding/codecs/vp8/simulcast_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h b/modules/video_coding/codecs/vp8/temporal_layers.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
rename to modules/video_coding/codecs/vp8/temporal_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
rename to modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/modules/video_coding/codecs/vp8/vp8_impl.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
rename to modules/video_coding/codecs/vp8/vp8_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/modules/video_coding/codecs/vp8/vp8_impl.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
rename to modules/video_coding/codecs/vp8/vp8_impl.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/include/vp9.h b/modules/video_coding/codecs/vp9/include/vp9.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/include/vp9.h
rename to modules/video_coding/codecs/vp9/include/vp9.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h b/modules/video_coding/codecs/vp9/include/vp9_globals.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h
rename to modules/video_coding/codecs/vp9/include/vp9_globals.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc b/modules/video_coding/codecs/vp9/screenshare_layers.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc
rename to modules/video_coding/codecs/vp9/screenshare_layers.cc
diff --git a/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h b/modules/video_coding/codecs/vp9/screenshare_layers.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h
rename to modules/video_coding/codecs/vp9/screenshare_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
rename to modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
rename to modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
rename to modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
rename to modules/video_coding/codecs/vp9/vp9_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h b/modules/video_coding/codecs/vp9/vp9_impl.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_impl.h
rename to modules/video_coding/codecs/vp9/vp9_impl.h
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc b/modules/video_coding/codecs/vp9/vp9_noop.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc
rename to modules/video_coding/codecs/vp9/vp9_noop.cc
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
rename to modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
diff --git a/webrtc/modules/video_coding/decoding_state.cc b/modules/video_coding/decoding_state.cc
similarity index 100%
rename from webrtc/modules/video_coding/decoding_state.cc
rename to modules/video_coding/decoding_state.cc
diff --git a/webrtc/modules/video_coding/decoding_state.h b/modules/video_coding/decoding_state.h
similarity index 100%
rename from webrtc/modules/video_coding/decoding_state.h
rename to modules/video_coding/decoding_state.h
diff --git a/webrtc/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/decoding_state_unittest.cc
rename to modules/video_coding/decoding_state_unittest.cc
diff --git a/webrtc/modules/video_coding/encoded_frame.cc b/modules/video_coding/encoded_frame.cc
similarity index 100%
rename from webrtc/modules/video_coding/encoded_frame.cc
rename to modules/video_coding/encoded_frame.cc
diff --git a/webrtc/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h
similarity index 100%
rename from webrtc/modules/video_coding/encoded_frame.h
rename to modules/video_coding/encoded_frame.h
diff --git a/webrtc/modules/video_coding/fec_rate_table.h b/modules/video_coding/fec_rate_table.h
similarity index 100%
rename from webrtc/modules/video_coding/fec_rate_table.h
rename to modules/video_coding/fec_rate_table.h
diff --git a/webrtc/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc
similarity index 100%
rename from webrtc/modules/video_coding/frame_buffer.cc
rename to modules/video_coding/frame_buffer.cc
diff --git a/webrtc/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h
similarity index 100%
rename from webrtc/modules/video_coding/frame_buffer.h
rename to modules/video_coding/frame_buffer.h
diff --git a/webrtc/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
similarity index 100%
rename from webrtc/modules/video_coding/frame_buffer2.cc
rename to modules/video_coding/frame_buffer2.cc
diff --git a/webrtc/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h
similarity index 100%
rename from webrtc/modules/video_coding/frame_buffer2.h
rename to modules/video_coding/frame_buffer2.h
diff --git a/webrtc/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/frame_buffer2_unittest.cc
rename to modules/video_coding/frame_buffer2_unittest.cc
diff --git a/webrtc/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
similarity index 100%
rename from webrtc/modules/video_coding/frame_object.cc
rename to modules/video_coding/frame_object.cc
diff --git a/webrtc/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
similarity index 100%
rename from webrtc/modules/video_coding/frame_object.h
rename to modules/video_coding/frame_object.h
diff --git a/webrtc/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
similarity index 100%
rename from webrtc/modules/video_coding/generic_decoder.cc
rename to modules/video_coding/generic_decoder.cc
diff --git a/webrtc/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
similarity index 100%
rename from webrtc/modules/video_coding/generic_decoder.h
rename to modules/video_coding/generic_decoder.h
diff --git a/webrtc/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc
similarity index 100%
rename from webrtc/modules/video_coding/generic_encoder.cc
rename to modules/video_coding/generic_encoder.cc
diff --git a/webrtc/modules/video_coding/generic_encoder.h b/modules/video_coding/generic_encoder.h
similarity index 100%
rename from webrtc/modules/video_coding/generic_encoder.h
rename to modules/video_coding/generic_encoder.h
diff --git a/webrtc/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/generic_encoder_unittest.cc
rename to modules/video_coding/generic_encoder_unittest.cc
diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc
similarity index 100%
rename from webrtc/modules/video_coding/h264_sprop_parameter_sets.cc
rename to modules/video_coding/h264_sprop_parameter_sets.cc
diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets.h b/modules/video_coding/h264_sprop_parameter_sets.h
similarity index 100%
rename from webrtc/modules/video_coding/h264_sprop_parameter_sets.h
rename to modules/video_coding/h264_sprop_parameter_sets.h
diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc b/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
rename to modules/video_coding/h264_sprop_parameter_sets_unittest.cc
diff --git a/webrtc/modules/video_coding/h264_sps_pps_tracker.cc b/modules/video_coding/h264_sps_pps_tracker.cc
similarity index 100%
rename from webrtc/modules/video_coding/h264_sps_pps_tracker.cc
rename to modules/video_coding/h264_sps_pps_tracker.cc
diff --git a/webrtc/modules/video_coding/h264_sps_pps_tracker.h b/modules/video_coding/h264_sps_pps_tracker.h
similarity index 100%
rename from webrtc/modules/video_coding/h264_sps_pps_tracker.h
rename to modules/video_coding/h264_sps_pps_tracker.h
diff --git a/webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc b/modules/video_coding/h264_sps_pps_tracker_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc
rename to modules/video_coding/h264_sps_pps_tracker_unittest.cc
diff --git a/webrtc/modules/video_coding/histogram.cc b/modules/video_coding/histogram.cc
similarity index 100%
rename from webrtc/modules/video_coding/histogram.cc
rename to modules/video_coding/histogram.cc
diff --git a/webrtc/modules/video_coding/histogram.h b/modules/video_coding/histogram.h
similarity index 100%
rename from webrtc/modules/video_coding/histogram.h
rename to modules/video_coding/histogram.h
diff --git a/webrtc/modules/video_coding/histogram_unittest.cc b/modules/video_coding/histogram_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/histogram_unittest.cc
rename to modules/video_coding/histogram_unittest.cc
diff --git a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h b/modules/video_coding/include/mock/mock_vcm_callbacks.h
similarity index 100%
rename from webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h
rename to modules/video_coding/include/mock/mock_vcm_callbacks.h
diff --git a/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h
similarity index 100%
rename from webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h
rename to modules/video_coding/include/mock/mock_video_codec_interface.h
diff --git a/webrtc/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h
similarity index 100%
rename from webrtc/modules/video_coding/include/video_codec_initializer.h
rename to modules/video_coding/include/video_codec_initializer.h
diff --git a/webrtc/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h
similarity index 100%
rename from webrtc/modules/video_coding/include/video_codec_interface.h
rename to modules/video_coding/include/video_codec_interface.h
diff --git a/webrtc/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h
similarity index 100%
rename from webrtc/modules/video_coding/include/video_coding.h
rename to modules/video_coding/include/video_coding.h
diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
similarity index 100%
rename from webrtc/modules/video_coding/include/video_coding_defines.h
rename to modules/video_coding/include/video_coding_defines.h
diff --git a/webrtc/modules/video_coding/include/video_error_codes.h b/modules/video_coding/include/video_error_codes.h
similarity index 100%
rename from webrtc/modules/video_coding/include/video_error_codes.h
rename to modules/video_coding/include/video_error_codes.h
diff --git a/webrtc/modules/video_coding/inter_frame_delay.cc b/modules/video_coding/inter_frame_delay.cc
similarity index 100%
rename from webrtc/modules/video_coding/inter_frame_delay.cc
rename to modules/video_coding/inter_frame_delay.cc
diff --git a/webrtc/modules/video_coding/inter_frame_delay.h b/modules/video_coding/inter_frame_delay.h
similarity index 100%
rename from webrtc/modules/video_coding/inter_frame_delay.h
rename to modules/video_coding/inter_frame_delay.h
diff --git a/webrtc/modules/video_coding/internal_defines.h b/modules/video_coding/internal_defines.h
similarity index 100%
rename from webrtc/modules/video_coding/internal_defines.h
rename to modules/video_coding/internal_defines.h
diff --git a/webrtc/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc
similarity index 100%
rename from webrtc/modules/video_coding/jitter_buffer.cc
rename to modules/video_coding/jitter_buffer.cc
diff --git a/webrtc/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h
similarity index 100%
rename from webrtc/modules/video_coding/jitter_buffer.h
rename to modules/video_coding/jitter_buffer.h
diff --git a/webrtc/modules/video_coding/jitter_buffer_common.h b/modules/video_coding/jitter_buffer_common.h
similarity index 100%
rename from webrtc/modules/video_coding/jitter_buffer_common.h
rename to modules/video_coding/jitter_buffer_common.h
diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/jitter_buffer_unittest.cc
rename to modules/video_coding/jitter_buffer_unittest.cc
diff --git a/webrtc/modules/video_coding/jitter_estimator.cc b/modules/video_coding/jitter_estimator.cc
similarity index 100%
rename from webrtc/modules/video_coding/jitter_estimator.cc
rename to modules/video_coding/jitter_estimator.cc
diff --git a/webrtc/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h
similarity index 100%
rename from webrtc/modules/video_coding/jitter_estimator.h
rename to modules/video_coding/jitter_estimator.h
diff --git a/webrtc/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
similarity index 100%
rename from webrtc/modules/video_coding/jitter_estimator_tests.cc
rename to modules/video_coding/jitter_estimator_tests.cc
diff --git a/webrtc/modules/video_coding/media_opt_util.cc b/modules/video_coding/media_opt_util.cc
similarity index 100%
rename from webrtc/modules/video_coding/media_opt_util.cc
rename to modules/video_coding/media_opt_util.cc
diff --git a/webrtc/modules/video_coding/media_opt_util.h b/modules/video_coding/media_opt_util.h
similarity index 100%
rename from webrtc/modules/video_coding/media_opt_util.h
rename to modules/video_coding/media_opt_util.h
diff --git a/webrtc/modules/video_coding/media_optimization.cc b/modules/video_coding/media_optimization.cc
similarity index 100%
rename from webrtc/modules/video_coding/media_optimization.cc
rename to modules/video_coding/media_optimization.cc
diff --git a/webrtc/modules/video_coding/media_optimization.h b/modules/video_coding/media_optimization.h
similarity index 100%
rename from webrtc/modules/video_coding/media_optimization.h
rename to modules/video_coding/media_optimization.h
diff --git a/webrtc/modules/video_coding/nack_fec_tables.h b/modules/video_coding/nack_fec_tables.h
similarity index 100%
rename from webrtc/modules/video_coding/nack_fec_tables.h
rename to modules/video_coding/nack_fec_tables.h
diff --git a/webrtc/modules/video_coding/nack_module.cc b/modules/video_coding/nack_module.cc
similarity index 100%
rename from webrtc/modules/video_coding/nack_module.cc
rename to modules/video_coding/nack_module.cc
diff --git a/webrtc/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h
similarity index 100%
rename from webrtc/modules/video_coding/nack_module.h
rename to modules/video_coding/nack_module.h
diff --git a/webrtc/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/nack_module_unittest.cc
rename to modules/video_coding/nack_module_unittest.cc
diff --git a/webrtc/modules/video_coding/packet.cc b/modules/video_coding/packet.cc
similarity index 100%
rename from webrtc/modules/video_coding/packet.cc
rename to modules/video_coding/packet.cc
diff --git a/webrtc/modules/video_coding/packet.h b/modules/video_coding/packet.h
similarity index 100%
rename from webrtc/modules/video_coding/packet.h
rename to modules/video_coding/packet.h
diff --git a/webrtc/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
similarity index 100%
rename from webrtc/modules/video_coding/packet_buffer.cc
rename to modules/video_coding/packet_buffer.cc
diff --git a/webrtc/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
similarity index 100%
rename from webrtc/modules/video_coding/packet_buffer.h
rename to modules/video_coding/packet_buffer.h
diff --git a/webrtc/modules/video_coding/protection_bitrate_calculator.cc b/modules/video_coding/protection_bitrate_calculator.cc
similarity index 100%
rename from webrtc/modules/video_coding/protection_bitrate_calculator.cc
rename to modules/video_coding/protection_bitrate_calculator.cc
diff --git a/webrtc/modules/video_coding/protection_bitrate_calculator.h b/modules/video_coding/protection_bitrate_calculator.h
similarity index 100%
rename from webrtc/modules/video_coding/protection_bitrate_calculator.h
rename to modules/video_coding/protection_bitrate_calculator.h
diff --git a/webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc b/modules/video_coding/protection_bitrate_calculator_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc
rename to modules/video_coding/protection_bitrate_calculator_unittest.cc
diff --git a/webrtc/modules/video_coding/qp_parser.cc b/modules/video_coding/qp_parser.cc
similarity index 100%
rename from webrtc/modules/video_coding/qp_parser.cc
rename to modules/video_coding/qp_parser.cc
diff --git a/webrtc/modules/video_coding/qp_parser.h b/modules/video_coding/qp_parser.h
similarity index 100%
rename from webrtc/modules/video_coding/qp_parser.h
rename to modules/video_coding/qp_parser.h
diff --git a/webrtc/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc
similarity index 100%
rename from webrtc/modules/video_coding/receiver.cc
rename to modules/video_coding/receiver.cc
diff --git a/webrtc/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
similarity index 100%
rename from webrtc/modules/video_coding/receiver.h
rename to modules/video_coding/receiver.h
diff --git a/webrtc/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/receiver_unittest.cc
rename to modules/video_coding/receiver_unittest.cc
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc
similarity index 100%
rename from webrtc/modules/video_coding/rtp_frame_reference_finder.cc
rename to modules/video_coding/rtp_frame_reference_finder.cc
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h
similarity index 100%
rename from webrtc/modules/video_coding/rtp_frame_reference_finder.h
rename to modules/video_coding/rtp_frame_reference_finder.h
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc
rename to modules/video_coding/rtp_frame_reference_finder_unittest.cc
diff --git a/webrtc/modules/video_coding/rtt_filter.cc b/modules/video_coding/rtt_filter.cc
similarity index 100%
rename from webrtc/modules/video_coding/rtt_filter.cc
rename to modules/video_coding/rtt_filter.cc
diff --git a/webrtc/modules/video_coding/rtt_filter.h b/modules/video_coding/rtt_filter.h
similarity index 100%
rename from webrtc/modules/video_coding/rtt_filter.h
rename to modules/video_coding/rtt_filter.h
diff --git a/webrtc/modules/video_coding/sequence_number_util.h b/modules/video_coding/sequence_number_util.h
similarity index 100%
rename from webrtc/modules/video_coding/sequence_number_util.h
rename to modules/video_coding/sequence_number_util.h
diff --git a/webrtc/modules/video_coding/sequence_number_util_unittest.cc b/modules/video_coding/sequence_number_util_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/sequence_number_util_unittest.cc
rename to modules/video_coding/sequence_number_util_unittest.cc
diff --git a/webrtc/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
similarity index 100%
rename from webrtc/modules/video_coding/session_info.cc
rename to modules/video_coding/session_info.cc
diff --git a/webrtc/modules/video_coding/session_info.h b/modules/video_coding/session_info.h
similarity index 100%
rename from webrtc/modules/video_coding/session_info.h
rename to modules/video_coding/session_info.h
diff --git a/webrtc/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/session_info_unittest.cc
rename to modules/video_coding/session_info_unittest.cc
diff --git a/webrtc/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc
similarity index 100%
rename from webrtc/modules/video_coding/test/stream_generator.cc
rename to modules/video_coding/test/stream_generator.cc
diff --git a/webrtc/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h
similarity index 100%
rename from webrtc/modules/video_coding/test/stream_generator.h
rename to modules/video_coding/test/stream_generator.h
diff --git a/webrtc/modules/video_coding/test/test_util.h b/modules/video_coding/test/test_util.h
similarity index 100%
rename from webrtc/modules/video_coding/test/test_util.h
rename to modules/video_coding/test/test_util.h
diff --git a/webrtc/modules/video_coding/timestamp_map.cc b/modules/video_coding/timestamp_map.cc
similarity index 100%
rename from webrtc/modules/video_coding/timestamp_map.cc
rename to modules/video_coding/timestamp_map.cc
diff --git a/webrtc/modules/video_coding/timestamp_map.h b/modules/video_coding/timestamp_map.h
similarity index 100%
rename from webrtc/modules/video_coding/timestamp_map.h
rename to modules/video_coding/timestamp_map.h
diff --git a/webrtc/modules/video_coding/timing.cc b/modules/video_coding/timing.cc
similarity index 100%
rename from webrtc/modules/video_coding/timing.cc
rename to modules/video_coding/timing.cc
diff --git a/webrtc/modules/video_coding/timing.h b/modules/video_coding/timing.h
similarity index 100%
rename from webrtc/modules/video_coding/timing.h
rename to modules/video_coding/timing.h
diff --git a/webrtc/modules/video_coding/timing_unittest.cc b/modules/video_coding/timing_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/timing_unittest.cc
rename to modules/video_coding/timing_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc b/modules/video_coding/utility/default_video_bitrate_allocator.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
rename to modules/video_coding/utility/default_video_bitrate_allocator.cc
diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h b/modules/video_coding/utility/default_video_bitrate_allocator.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h
rename to modules/video_coding/utility/default_video_bitrate_allocator.h
diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
rename to modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/frame_dropper.cc b/modules/video_coding/utility/frame_dropper.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/frame_dropper.cc
rename to modules/video_coding/utility/frame_dropper.cc
diff --git a/webrtc/modules/video_coding/utility/frame_dropper.h b/modules/video_coding/utility/frame_dropper.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/frame_dropper.h
rename to modules/video_coding/utility/frame_dropper.h
diff --git a/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc b/modules/video_coding/utility/frame_dropper_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/frame_dropper_unittest.cc
rename to modules/video_coding/utility/frame_dropper_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer.cc b/modules/video_coding/utility/ivf_file_writer.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/ivf_file_writer.cc
rename to modules/video_coding/utility/ivf_file_writer.cc
diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/ivf_file_writer.h
rename to modules/video_coding/utility/ivf_file_writer.h
diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc
rename to modules/video_coding/utility/ivf_file_writer_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h b/modules/video_coding/utility/mock/mock_frame_dropper.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h
rename to modules/video_coding/utility/mock/mock_frame_dropper.h
diff --git a/webrtc/modules/video_coding/utility/moving_average.cc b/modules/video_coding/utility/moving_average.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/moving_average.cc
rename to modules/video_coding/utility/moving_average.cc
diff --git a/webrtc/modules/video_coding/utility/moving_average.h b/modules/video_coding/utility/moving_average.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/moving_average.h
rename to modules/video_coding/utility/moving_average.h
diff --git a/webrtc/modules/video_coding/utility/moving_average_unittest.cc b/modules/video_coding/utility/moving_average_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/moving_average_unittest.cc
rename to modules/video_coding/utility/moving_average_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/quality_scaler.cc b/modules/video_coding/utility/quality_scaler.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/quality_scaler.cc
rename to modules/video_coding/utility/quality_scaler.cc
diff --git a/webrtc/modules/video_coding/utility/quality_scaler.h b/modules/video_coding/utility/quality_scaler.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/quality_scaler.h
rename to modules/video_coding/utility/quality_scaler.h
diff --git a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc b/modules/video_coding/utility/quality_scaler_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/quality_scaler_unittest.cc
rename to modules/video_coding/utility/quality_scaler_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
rename to modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
diff --git a/webrtc/modules/video_coding/utility/vp8_header_parser.cc b/modules/video_coding/utility/vp8_header_parser.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/vp8_header_parser.cc
rename to modules/video_coding/utility/vp8_header_parser.cc
diff --git a/webrtc/modules/video_coding/utility/vp8_header_parser.h b/modules/video_coding/utility/vp8_header_parser.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/vp8_header_parser.h
rename to modules/video_coding/utility/vp8_header_parser.h
diff --git a/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
similarity index 100%
rename from webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
rename to modules/video_coding/utility/vp9_uncompressed_header_parser.cc
diff --git a/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h b/modules/video_coding/utility/vp9_uncompressed_header_parser.h
similarity index 100%
rename from webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h
rename to modules/video_coding/utility/vp9_uncompressed_header_parser.h
diff --git a/webrtc/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_codec_initializer.cc
rename to modules/video_coding/video_codec_initializer.cc
diff --git a/webrtc/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_codec_initializer_unittest.cc
rename to modules/video_coding/video_codec_initializer_unittest.cc
diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_coding_impl.cc
rename to modules/video_coding/video_coding_impl.cc
diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
similarity index 100%
rename from webrtc/modules/video_coding/video_coding_impl.h
rename to modules/video_coding/video_coding_impl.h
diff --git a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_packet_buffer_unittest.cc
rename to modules/video_coding/video_packet_buffer_unittest.cc
diff --git a/webrtc/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_receiver.cc
rename to modules/video_coding/video_receiver.cc
diff --git a/webrtc/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_receiver_unittest.cc
rename to modules/video_coding/video_receiver_unittest.cc
diff --git a/webrtc/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_sender.cc
rename to modules/video_coding/video_sender.cc
diff --git a/webrtc/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc
similarity index 100%
rename from webrtc/modules/video_coding/video_sender_unittest.cc
rename to modules/video_coding/video_sender_unittest.cc
diff --git a/webrtc/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
similarity index 100%
rename from webrtc/modules/video_processing/BUILD.gn
rename to modules/video_processing/BUILD.gn
diff --git a/webrtc/modules/video_processing/DEPS b/modules/video_processing/DEPS
similarity index 100%
rename from webrtc/modules/video_processing/DEPS
rename to modules/video_processing/DEPS
diff --git a/webrtc/modules/video_processing/OWNERS b/modules/video_processing/OWNERS
similarity index 100%
rename from webrtc/modules/video_processing/OWNERS
rename to modules/video_processing/OWNERS
diff --git a/webrtc/modules/video_processing/test/denoiser_test.cc b/modules/video_processing/test/denoiser_test.cc
similarity index 100%
rename from webrtc/modules/video_processing/test/denoiser_test.cc
rename to modules/video_processing/test/denoiser_test.cc
diff --git a/webrtc/modules/video_processing/util/denoiser_filter.cc b/modules/video_processing/util/denoiser_filter.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter.cc
rename to modules/video_processing/util/denoiser_filter.cc
diff --git a/webrtc/modules/video_processing/util/denoiser_filter.h b/modules/video_processing/util/denoiser_filter.h
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter.h
rename to modules/video_processing/util/denoiser_filter.h
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_c.cc b/modules/video_processing/util/denoiser_filter_c.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_c.cc
rename to modules/video_processing/util/denoiser_filter_c.cc
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_c.h b/modules/video_processing/util/denoiser_filter_c.h
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_c.h
rename to modules/video_processing/util/denoiser_filter_c.h
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_neon.cc b/modules/video_processing/util/denoiser_filter_neon.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_neon.cc
rename to modules/video_processing/util/denoiser_filter_neon.cc
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_neon.h b/modules/video_processing/util/denoiser_filter_neon.h
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_neon.h
rename to modules/video_processing/util/denoiser_filter_neon.h
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_sse2.cc b/modules/video_processing/util/denoiser_filter_sse2.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_sse2.cc
rename to modules/video_processing/util/denoiser_filter_sse2.cc
diff --git a/webrtc/modules/video_processing/util/denoiser_filter_sse2.h b/modules/video_processing/util/denoiser_filter_sse2.h
similarity index 100%
rename from webrtc/modules/video_processing/util/denoiser_filter_sse2.h
rename to modules/video_processing/util/denoiser_filter_sse2.h
diff --git a/webrtc/modules/video_processing/util/noise_estimation.cc b/modules/video_processing/util/noise_estimation.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/noise_estimation.cc
rename to modules/video_processing/util/noise_estimation.cc
diff --git a/webrtc/modules/video_processing/util/noise_estimation.h b/modules/video_processing/util/noise_estimation.h
similarity index 100%
rename from webrtc/modules/video_processing/util/noise_estimation.h
rename to modules/video_processing/util/noise_estimation.h
diff --git a/webrtc/modules/video_processing/util/skin_detection.cc b/modules/video_processing/util/skin_detection.cc
similarity index 100%
rename from webrtc/modules/video_processing/util/skin_detection.cc
rename to modules/video_processing/util/skin_detection.cc
diff --git a/webrtc/modules/video_processing/util/skin_detection.h b/modules/video_processing/util/skin_detection.h
similarity index 100%
rename from webrtc/modules/video_processing/util/skin_detection.h
rename to modules/video_processing/util/skin_detection.h
diff --git a/webrtc/modules/video_processing/video_denoiser.cc b/modules/video_processing/video_denoiser.cc
similarity index 100%
rename from webrtc/modules/video_processing/video_denoiser.cc
rename to modules/video_processing/video_denoiser.cc
diff --git a/webrtc/modules/video_processing/video_denoiser.h b/modules/video_processing/video_denoiser.h
similarity index 100%
rename from webrtc/modules/video_processing/video_denoiser.h
rename to modules/video_processing/video_denoiser.h
diff --git a/webrtc/ortc/BUILD.gn b/ortc/BUILD.gn
similarity index 100%
rename from webrtc/ortc/BUILD.gn
rename to ortc/BUILD.gn
diff --git a/webrtc/ortc/DEPS b/ortc/DEPS
similarity index 100%
rename from webrtc/ortc/DEPS
rename to ortc/DEPS
diff --git a/webrtc/ortc/OWNERS b/ortc/OWNERS
similarity index 100%
rename from webrtc/ortc/OWNERS
rename to ortc/OWNERS
diff --git a/webrtc/ortc/ortcfactory.cc b/ortc/ortcfactory.cc
similarity index 100%
rename from webrtc/ortc/ortcfactory.cc
rename to ortc/ortcfactory.cc
diff --git a/webrtc/ortc/ortcfactory.h b/ortc/ortcfactory.h
similarity index 100%
rename from webrtc/ortc/ortcfactory.h
rename to ortc/ortcfactory.h
diff --git a/webrtc/ortc/ortcfactory_integrationtest.cc b/ortc/ortcfactory_integrationtest.cc
similarity index 100%
rename from webrtc/ortc/ortcfactory_integrationtest.cc
rename to ortc/ortcfactory_integrationtest.cc
diff --git a/webrtc/ortc/ortcfactory_unittest.cc b/ortc/ortcfactory_unittest.cc
similarity index 100%
rename from webrtc/ortc/ortcfactory_unittest.cc
rename to ortc/ortcfactory_unittest.cc
diff --git a/webrtc/ortc/ortcrtpreceiver_unittest.cc b/ortc/ortcrtpreceiver_unittest.cc
similarity index 100%
rename from webrtc/ortc/ortcrtpreceiver_unittest.cc
rename to ortc/ortcrtpreceiver_unittest.cc
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.cc b/ortc/ortcrtpreceiveradapter.cc
similarity index 100%
rename from webrtc/ortc/ortcrtpreceiveradapter.cc
rename to ortc/ortcrtpreceiveradapter.cc
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.h b/ortc/ortcrtpreceiveradapter.h
similarity index 100%
rename from webrtc/ortc/ortcrtpreceiveradapter.h
rename to ortc/ortcrtpreceiveradapter.h
diff --git a/webrtc/ortc/ortcrtpsender_unittest.cc b/ortc/ortcrtpsender_unittest.cc
similarity index 100%
rename from webrtc/ortc/ortcrtpsender_unittest.cc
rename to ortc/ortcrtpsender_unittest.cc
diff --git a/webrtc/ortc/ortcrtpsenderadapter.cc b/ortc/ortcrtpsenderadapter.cc
similarity index 100%
rename from webrtc/ortc/ortcrtpsenderadapter.cc
rename to ortc/ortcrtpsenderadapter.cc
diff --git a/webrtc/ortc/ortcrtpsenderadapter.h b/ortc/ortcrtpsenderadapter.h
similarity index 100%
rename from webrtc/ortc/ortcrtpsenderadapter.h
rename to ortc/ortcrtpsenderadapter.h
diff --git a/webrtc/ortc/rtpparametersconversion.cc b/ortc/rtpparametersconversion.cc
similarity index 100%
rename from webrtc/ortc/rtpparametersconversion.cc
rename to ortc/rtpparametersconversion.cc
diff --git a/webrtc/ortc/rtpparametersconversion.h b/ortc/rtpparametersconversion.h
similarity index 100%
rename from webrtc/ortc/rtpparametersconversion.h
rename to ortc/rtpparametersconversion.h
diff --git a/webrtc/ortc/rtpparametersconversion_unittest.cc b/ortc/rtpparametersconversion_unittest.cc
similarity index 100%
rename from webrtc/ortc/rtpparametersconversion_unittest.cc
rename to ortc/rtpparametersconversion_unittest.cc
diff --git a/webrtc/ortc/rtptransport_unittest.cc b/ortc/rtptransport_unittest.cc
similarity index 100%
rename from webrtc/ortc/rtptransport_unittest.cc
rename to ortc/rtptransport_unittest.cc
diff --git a/webrtc/ortc/rtptransportadapter.cc b/ortc/rtptransportadapter.cc
similarity index 100%
rename from webrtc/ortc/rtptransportadapter.cc
rename to ortc/rtptransportadapter.cc
diff --git a/webrtc/ortc/rtptransportadapter.h b/ortc/rtptransportadapter.h
similarity index 100%
rename from webrtc/ortc/rtptransportadapter.h
rename to ortc/rtptransportadapter.h
diff --git a/webrtc/ortc/rtptransportcontroller_unittest.cc b/ortc/rtptransportcontroller_unittest.cc
similarity index 100%
rename from webrtc/ortc/rtptransportcontroller_unittest.cc
rename to ortc/rtptransportcontroller_unittest.cc
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.cc b/ortc/rtptransportcontrolleradapter.cc
similarity index 100%
rename from webrtc/ortc/rtptransportcontrolleradapter.cc
rename to ortc/rtptransportcontrolleradapter.cc
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/ortc/rtptransportcontrolleradapter.h
similarity index 100%
rename from webrtc/ortc/rtptransportcontrolleradapter.h
rename to ortc/rtptransportcontrolleradapter.h
diff --git a/webrtc/ortc/srtptransport_unittest.cc b/ortc/srtptransport_unittest.cc
similarity index 100%
rename from webrtc/ortc/srtptransport_unittest.cc
rename to ortc/srtptransport_unittest.cc
diff --git a/webrtc/ortc/testrtpparameters.cc b/ortc/testrtpparameters.cc
similarity index 100%
rename from webrtc/ortc/testrtpparameters.cc
rename to ortc/testrtpparameters.cc
diff --git a/webrtc/ortc/testrtpparameters.h b/ortc/testrtpparameters.h
similarity index 100%
rename from webrtc/ortc/testrtpparameters.h
rename to ortc/testrtpparameters.h
diff --git a/webrtc/p2p/BUILD.gn b/p2p/BUILD.gn
similarity index 100%
rename from webrtc/p2p/BUILD.gn
rename to p2p/BUILD.gn
diff --git a/webrtc/p2p/DEPS b/p2p/DEPS
similarity index 100%
rename from webrtc/p2p/DEPS
rename to p2p/DEPS
diff --git a/webrtc/p2p/OWNERS b/p2p/OWNERS
similarity index 100%
rename from webrtc/p2p/OWNERS
rename to p2p/OWNERS
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.cc b/p2p/base/asyncstuntcpsocket.cc
similarity index 100%
rename from webrtc/p2p/base/asyncstuntcpsocket.cc
rename to p2p/base/asyncstuntcpsocket.cc
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.h b/p2p/base/asyncstuntcpsocket.h
similarity index 100%
rename from webrtc/p2p/base/asyncstuntcpsocket.h
rename to p2p/base/asyncstuntcpsocket.h
diff --git a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc b/p2p/base/asyncstuntcpsocket_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
rename to p2p/base/asyncstuntcpsocket_unittest.cc
diff --git a/webrtc/p2p/base/basicpacketsocketfactory.cc b/p2p/base/basicpacketsocketfactory.cc
similarity index 100%
rename from webrtc/p2p/base/basicpacketsocketfactory.cc
rename to p2p/base/basicpacketsocketfactory.cc
diff --git a/webrtc/p2p/base/basicpacketsocketfactory.h b/p2p/base/basicpacketsocketfactory.h
similarity index 100%
rename from webrtc/p2p/base/basicpacketsocketfactory.h
rename to p2p/base/basicpacketsocketfactory.h
diff --git a/webrtc/p2p/base/candidate.h b/p2p/base/candidate.h
similarity index 100%
rename from webrtc/p2p/base/candidate.h
rename to p2p/base/candidate.h
diff --git a/webrtc/p2p/base/candidatepairinterface.h b/p2p/base/candidatepairinterface.h
similarity index 100%
rename from webrtc/p2p/base/candidatepairinterface.h
rename to p2p/base/candidatepairinterface.h
diff --git a/webrtc/p2p/base/common.h b/p2p/base/common.h
similarity index 100%
rename from webrtc/p2p/base/common.h
rename to p2p/base/common.h
diff --git a/webrtc/p2p/base/dtlstransport.cc b/p2p/base/dtlstransport.cc
similarity index 100%
rename from webrtc/p2p/base/dtlstransport.cc
rename to p2p/base/dtlstransport.cc
diff --git a/webrtc/p2p/base/dtlstransport.h b/p2p/base/dtlstransport.h
similarity index 100%
rename from webrtc/p2p/base/dtlstransport.h
rename to p2p/base/dtlstransport.h
diff --git a/webrtc/p2p/base/dtlstransport_unittest.cc b/p2p/base/dtlstransport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/dtlstransport_unittest.cc
rename to p2p/base/dtlstransport_unittest.cc
diff --git a/webrtc/p2p/base/dtlstransportinternal.h b/p2p/base/dtlstransportinternal.h
similarity index 100%
rename from webrtc/p2p/base/dtlstransportinternal.h
rename to p2p/base/dtlstransportinternal.h
diff --git a/webrtc/p2p/base/fakecandidatepair.h b/p2p/base/fakecandidatepair.h
similarity index 100%
rename from webrtc/p2p/base/fakecandidatepair.h
rename to p2p/base/fakecandidatepair.h
diff --git a/webrtc/p2p/base/fakedtlstransport.h b/p2p/base/fakedtlstransport.h
similarity index 100%
rename from webrtc/p2p/base/fakedtlstransport.h
rename to p2p/base/fakedtlstransport.h
diff --git a/webrtc/p2p/base/fakeicetransport.h b/p2p/base/fakeicetransport.h
similarity index 100%
rename from webrtc/p2p/base/fakeicetransport.h
rename to p2p/base/fakeicetransport.h
diff --git a/webrtc/p2p/base/fakepackettransport.h b/p2p/base/fakepackettransport.h
similarity index 100%
rename from webrtc/p2p/base/fakepackettransport.h
rename to p2p/base/fakepackettransport.h
diff --git a/webrtc/p2p/base/fakeportallocator.h b/p2p/base/fakeportallocator.h
similarity index 100%
rename from webrtc/p2p/base/fakeportallocator.h
rename to p2p/base/fakeportallocator.h
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/p2p/base/faketransportcontroller.h
similarity index 100%
rename from webrtc/p2p/base/faketransportcontroller.h
rename to p2p/base/faketransportcontroller.h
diff --git a/webrtc/p2p/base/icetransportinternal.h b/p2p/base/icetransportinternal.h
similarity index 100%
rename from webrtc/p2p/base/icetransportinternal.h
rename to p2p/base/icetransportinternal.h
diff --git a/webrtc/p2p/base/jseptransport.cc b/p2p/base/jseptransport.cc
similarity index 100%
rename from webrtc/p2p/base/jseptransport.cc
rename to p2p/base/jseptransport.cc
diff --git a/webrtc/p2p/base/jseptransport.h b/p2p/base/jseptransport.h
similarity index 100%
rename from webrtc/p2p/base/jseptransport.h
rename to p2p/base/jseptransport.h
diff --git a/webrtc/p2p/base/jseptransport_unittest.cc b/p2p/base/jseptransport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/jseptransport_unittest.cc
rename to p2p/base/jseptransport_unittest.cc
diff --git a/webrtc/p2p/base/mockicetransport.h b/p2p/base/mockicetransport.h
similarity index 100%
rename from webrtc/p2p/base/mockicetransport.h
rename to p2p/base/mockicetransport.h
diff --git a/webrtc/p2p/base/p2pconstants.cc b/p2p/base/p2pconstants.cc
similarity index 100%
rename from webrtc/p2p/base/p2pconstants.cc
rename to p2p/base/p2pconstants.cc
diff --git a/webrtc/p2p/base/p2pconstants.h b/p2p/base/p2pconstants.h
similarity index 100%
rename from webrtc/p2p/base/p2pconstants.h
rename to p2p/base/p2pconstants.h
diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/p2p/base/p2ptransportchannel.cc
similarity index 100%
rename from webrtc/p2p/base/p2ptransportchannel.cc
rename to p2p/base/p2ptransportchannel.cc
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/p2p/base/p2ptransportchannel.h
similarity index 100%
rename from webrtc/p2p/base/p2ptransportchannel.h
rename to p2p/base/p2ptransportchannel.h
diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/p2ptransportchannel_unittest.cc
rename to p2p/base/p2ptransportchannel_unittest.cc
diff --git a/webrtc/p2p/base/packetlossestimator.cc b/p2p/base/packetlossestimator.cc
similarity index 100%
rename from webrtc/p2p/base/packetlossestimator.cc
rename to p2p/base/packetlossestimator.cc
diff --git a/webrtc/p2p/base/packetlossestimator.h b/p2p/base/packetlossestimator.h
similarity index 100%
rename from webrtc/p2p/base/packetlossestimator.h
rename to p2p/base/packetlossestimator.h
diff --git a/webrtc/p2p/base/packetlossestimator_unittest.cc b/p2p/base/packetlossestimator_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/packetlossestimator_unittest.cc
rename to p2p/base/packetlossestimator_unittest.cc
diff --git a/webrtc/p2p/base/packetsocketfactory.h b/p2p/base/packetsocketfactory.h
similarity index 100%
rename from webrtc/p2p/base/packetsocketfactory.h
rename to p2p/base/packetsocketfactory.h
diff --git a/webrtc/p2p/base/packettransportinterface.h b/p2p/base/packettransportinterface.h
similarity index 100%
rename from webrtc/p2p/base/packettransportinterface.h
rename to p2p/base/packettransportinterface.h
diff --git a/webrtc/p2p/base/packettransportinternal.h b/p2p/base/packettransportinternal.h
similarity index 100%
rename from webrtc/p2p/base/packettransportinternal.h
rename to p2p/base/packettransportinternal.h
diff --git a/webrtc/p2p/base/port.cc b/p2p/base/port.cc
similarity index 100%
rename from webrtc/p2p/base/port.cc
rename to p2p/base/port.cc
diff --git a/webrtc/p2p/base/port.h b/p2p/base/port.h
similarity index 100%
rename from webrtc/p2p/base/port.h
rename to p2p/base/port.h
diff --git a/webrtc/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/port_unittest.cc
rename to p2p/base/port_unittest.cc
diff --git a/webrtc/p2p/base/portallocator.cc b/p2p/base/portallocator.cc
similarity index 100%
rename from webrtc/p2p/base/portallocator.cc
rename to p2p/base/portallocator.cc
diff --git a/webrtc/p2p/base/portallocator.h b/p2p/base/portallocator.h
similarity index 100%
rename from webrtc/p2p/base/portallocator.h
rename to p2p/base/portallocator.h
diff --git a/webrtc/p2p/base/portallocator_unittest.cc b/p2p/base/portallocator_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/portallocator_unittest.cc
rename to p2p/base/portallocator_unittest.cc
diff --git a/webrtc/p2p/base/portinterface.h b/p2p/base/portinterface.h
similarity index 100%
rename from webrtc/p2p/base/portinterface.h
rename to p2p/base/portinterface.h
diff --git a/webrtc/p2p/base/pseudotcp.cc b/p2p/base/pseudotcp.cc
similarity index 100%
rename from webrtc/p2p/base/pseudotcp.cc
rename to p2p/base/pseudotcp.cc
diff --git a/webrtc/p2p/base/pseudotcp.h b/p2p/base/pseudotcp.h
similarity index 100%
rename from webrtc/p2p/base/pseudotcp.h
rename to p2p/base/pseudotcp.h
diff --git a/webrtc/p2p/base/pseudotcp_unittest.cc b/p2p/base/pseudotcp_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/pseudotcp_unittest.cc
rename to p2p/base/pseudotcp_unittest.cc
diff --git a/webrtc/p2p/base/relayport.cc b/p2p/base/relayport.cc
similarity index 100%
rename from webrtc/p2p/base/relayport.cc
rename to p2p/base/relayport.cc
diff --git a/webrtc/p2p/base/relayport.h b/p2p/base/relayport.h
similarity index 100%
rename from webrtc/p2p/base/relayport.h
rename to p2p/base/relayport.h
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/p2p/base/relayport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/relayport_unittest.cc
rename to p2p/base/relayport_unittest.cc
diff --git a/webrtc/p2p/base/relayserver.cc b/p2p/base/relayserver.cc
similarity index 100%
rename from webrtc/p2p/base/relayserver.cc
rename to p2p/base/relayserver.cc
diff --git a/webrtc/p2p/base/relayserver.h b/p2p/base/relayserver.h
similarity index 100%
rename from webrtc/p2p/base/relayserver.h
rename to p2p/base/relayserver.h
diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/p2p/base/relayserver_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/relayserver_unittest.cc
rename to p2p/base/relayserver_unittest.cc
diff --git a/webrtc/p2p/base/session.cc b/p2p/base/session.cc
similarity index 100%
rename from webrtc/p2p/base/session.cc
rename to p2p/base/session.cc
diff --git a/webrtc/p2p/base/session.h b/p2p/base/session.h
similarity index 100%
rename from webrtc/p2p/base/session.h
rename to p2p/base/session.h
diff --git a/webrtc/p2p/base/sessiondescription.cc b/p2p/base/sessiondescription.cc
similarity index 100%
rename from webrtc/p2p/base/sessiondescription.cc
rename to p2p/base/sessiondescription.cc
diff --git a/webrtc/p2p/base/sessiondescription.h b/p2p/base/sessiondescription.h
similarity index 100%
rename from webrtc/p2p/base/sessiondescription.h
rename to p2p/base/sessiondescription.h
diff --git a/webrtc/p2p/base/stun.cc b/p2p/base/stun.cc
similarity index 100%
rename from webrtc/p2p/base/stun.cc
rename to p2p/base/stun.cc
diff --git a/webrtc/p2p/base/stun.h b/p2p/base/stun.h
similarity index 100%
rename from webrtc/p2p/base/stun.h
rename to p2p/base/stun.h
diff --git a/webrtc/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/stun_unittest.cc
rename to p2p/base/stun_unittest.cc
diff --git a/webrtc/p2p/base/stunport.cc b/p2p/base/stunport.cc
similarity index 100%
rename from webrtc/p2p/base/stunport.cc
rename to p2p/base/stunport.cc
diff --git a/webrtc/p2p/base/stunport.h b/p2p/base/stunport.h
similarity index 100%
rename from webrtc/p2p/base/stunport.h
rename to p2p/base/stunport.h
diff --git a/webrtc/p2p/base/stunport_unittest.cc b/p2p/base/stunport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/stunport_unittest.cc
rename to p2p/base/stunport_unittest.cc
diff --git a/webrtc/p2p/base/stunrequest.cc b/p2p/base/stunrequest.cc
similarity index 100%
rename from webrtc/p2p/base/stunrequest.cc
rename to p2p/base/stunrequest.cc
diff --git a/webrtc/p2p/base/stunrequest.h b/p2p/base/stunrequest.h
similarity index 100%
rename from webrtc/p2p/base/stunrequest.h
rename to p2p/base/stunrequest.h
diff --git a/webrtc/p2p/base/stunrequest_unittest.cc b/p2p/base/stunrequest_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/stunrequest_unittest.cc
rename to p2p/base/stunrequest_unittest.cc
diff --git a/webrtc/p2p/base/stunserver.cc b/p2p/base/stunserver.cc
similarity index 100%
rename from webrtc/p2p/base/stunserver.cc
rename to p2p/base/stunserver.cc
diff --git a/webrtc/p2p/base/stunserver.h b/p2p/base/stunserver.h
similarity index 100%
rename from webrtc/p2p/base/stunserver.h
rename to p2p/base/stunserver.h
diff --git a/webrtc/p2p/base/stunserver_unittest.cc b/p2p/base/stunserver_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/stunserver_unittest.cc
rename to p2p/base/stunserver_unittest.cc
diff --git a/webrtc/p2p/base/tcpport.cc b/p2p/base/tcpport.cc
similarity index 100%
rename from webrtc/p2p/base/tcpport.cc
rename to p2p/base/tcpport.cc
diff --git a/webrtc/p2p/base/tcpport.h b/p2p/base/tcpport.h
similarity index 100%
rename from webrtc/p2p/base/tcpport.h
rename to p2p/base/tcpport.h
diff --git a/webrtc/p2p/base/tcpport_unittest.cc b/p2p/base/tcpport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/tcpport_unittest.cc
rename to p2p/base/tcpport_unittest.cc
diff --git a/webrtc/p2p/base/testrelayserver.h b/p2p/base/testrelayserver.h
similarity index 100%
rename from webrtc/p2p/base/testrelayserver.h
rename to p2p/base/testrelayserver.h
diff --git a/webrtc/p2p/base/teststunserver.h b/p2p/base/teststunserver.h
similarity index 100%
rename from webrtc/p2p/base/teststunserver.h
rename to p2p/base/teststunserver.h
diff --git a/webrtc/p2p/base/testturnserver.h b/p2p/base/testturnserver.h
similarity index 100%
rename from webrtc/p2p/base/testturnserver.h
rename to p2p/base/testturnserver.h
diff --git a/webrtc/p2p/base/transport.h b/p2p/base/transport.h
similarity index 100%
rename from webrtc/p2p/base/transport.h
rename to p2p/base/transport.h
diff --git a/webrtc/p2p/base/transportchannelimpl.h b/p2p/base/transportchannelimpl.h
similarity index 100%
rename from webrtc/p2p/base/transportchannelimpl.h
rename to p2p/base/transportchannelimpl.h
diff --git a/webrtc/p2p/base/transportcontroller.cc b/p2p/base/transportcontroller.cc
similarity index 100%
rename from webrtc/p2p/base/transportcontroller.cc
rename to p2p/base/transportcontroller.cc
diff --git a/webrtc/p2p/base/transportcontroller.h b/p2p/base/transportcontroller.h
similarity index 100%
rename from webrtc/p2p/base/transportcontroller.h
rename to p2p/base/transportcontroller.h
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/p2p/base/transportcontroller_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/transportcontroller_unittest.cc
rename to p2p/base/transportcontroller_unittest.cc
diff --git a/webrtc/p2p/base/transportdescription.cc b/p2p/base/transportdescription.cc
similarity index 100%
rename from webrtc/p2p/base/transportdescription.cc
rename to p2p/base/transportdescription.cc
diff --git a/webrtc/p2p/base/transportdescription.h b/p2p/base/transportdescription.h
similarity index 100%
rename from webrtc/p2p/base/transportdescription.h
rename to p2p/base/transportdescription.h
diff --git a/webrtc/p2p/base/transportdescriptionfactory.cc b/p2p/base/transportdescriptionfactory.cc
similarity index 100%
rename from webrtc/p2p/base/transportdescriptionfactory.cc
rename to p2p/base/transportdescriptionfactory.cc
diff --git a/webrtc/p2p/base/transportdescriptionfactory.h b/p2p/base/transportdescriptionfactory.h
similarity index 100%
rename from webrtc/p2p/base/transportdescriptionfactory.h
rename to p2p/base/transportdescriptionfactory.h
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/p2p/base/transportdescriptionfactory_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/transportdescriptionfactory_unittest.cc
rename to p2p/base/transportdescriptionfactory_unittest.cc
diff --git a/webrtc/p2p/base/transportinfo.h b/p2p/base/transportinfo.h
similarity index 100%
rename from webrtc/p2p/base/transportinfo.h
rename to p2p/base/transportinfo.h
diff --git a/webrtc/p2p/base/turnport.cc b/p2p/base/turnport.cc
similarity index 100%
rename from webrtc/p2p/base/turnport.cc
rename to p2p/base/turnport.cc
diff --git a/webrtc/p2p/base/turnport.h b/p2p/base/turnport.h
similarity index 100%
rename from webrtc/p2p/base/turnport.h
rename to p2p/base/turnport.h
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/p2p/base/turnport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/turnport_unittest.cc
rename to p2p/base/turnport_unittest.cc
diff --git a/webrtc/p2p/base/turnserver.cc b/p2p/base/turnserver.cc
similarity index 100%
rename from webrtc/p2p/base/turnserver.cc
rename to p2p/base/turnserver.cc
diff --git a/webrtc/p2p/base/turnserver.h b/p2p/base/turnserver.h
similarity index 100%
rename from webrtc/p2p/base/turnserver.h
rename to p2p/base/turnserver.h
diff --git a/webrtc/p2p/base/turnserver_unittest.cc b/p2p/base/turnserver_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/turnserver_unittest.cc
rename to p2p/base/turnserver_unittest.cc
diff --git a/webrtc/p2p/base/udpport.h b/p2p/base/udpport.h
similarity index 100%
rename from webrtc/p2p/base/udpport.h
rename to p2p/base/udpport.h
diff --git a/webrtc/p2p/base/udptransport.cc b/p2p/base/udptransport.cc
similarity index 100%
rename from webrtc/p2p/base/udptransport.cc
rename to p2p/base/udptransport.cc
diff --git a/webrtc/p2p/base/udptransport.h b/p2p/base/udptransport.h
similarity index 100%
rename from webrtc/p2p/base/udptransport.h
rename to p2p/base/udptransport.h
diff --git a/webrtc/p2p/base/udptransport_unittest.cc b/p2p/base/udptransport_unittest.cc
similarity index 100%
rename from webrtc/p2p/base/udptransport_unittest.cc
rename to p2p/base/udptransport_unittest.cc
diff --git a/webrtc/p2p/client/basicportallocator.cc b/p2p/client/basicportallocator.cc
similarity index 100%
rename from webrtc/p2p/client/basicportallocator.cc
rename to p2p/client/basicportallocator.cc
diff --git a/webrtc/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h
similarity index 100%
rename from webrtc/p2p/client/basicportallocator.h
rename to p2p/client/basicportallocator.h
diff --git a/webrtc/p2p/client/basicportallocator_unittest.cc b/p2p/client/basicportallocator_unittest.cc
similarity index 100%
rename from webrtc/p2p/client/basicportallocator_unittest.cc
rename to p2p/client/basicportallocator_unittest.cc
diff --git a/webrtc/p2p/client/socketmonitor.cc b/p2p/client/socketmonitor.cc
similarity index 100%
rename from webrtc/p2p/client/socketmonitor.cc
rename to p2p/client/socketmonitor.cc
diff --git a/webrtc/p2p/client/socketmonitor.h b/p2p/client/socketmonitor.h
similarity index 100%
rename from webrtc/p2p/client/socketmonitor.h
rename to p2p/client/socketmonitor.h
diff --git a/webrtc/p2p/quic/quicconnectionhelper.cc b/p2p/quic/quicconnectionhelper.cc
similarity index 100%
rename from webrtc/p2p/quic/quicconnectionhelper.cc
rename to p2p/quic/quicconnectionhelper.cc
diff --git a/webrtc/p2p/quic/quicconnectionhelper.h b/p2p/quic/quicconnectionhelper.h
similarity index 100%
rename from webrtc/p2p/quic/quicconnectionhelper.h
rename to p2p/quic/quicconnectionhelper.h
diff --git a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc b/p2p/quic/quicconnectionhelper_unittest.cc
similarity index 100%
rename from webrtc/p2p/quic/quicconnectionhelper_unittest.cc
rename to p2p/quic/quicconnectionhelper_unittest.cc
diff --git a/webrtc/p2p/quic/quicsession.cc b/p2p/quic/quicsession.cc
similarity index 100%
rename from webrtc/p2p/quic/quicsession.cc
rename to p2p/quic/quicsession.cc
diff --git a/webrtc/p2p/quic/quicsession.h b/p2p/quic/quicsession.h
similarity index 100%
rename from webrtc/p2p/quic/quicsession.h
rename to p2p/quic/quicsession.h
diff --git a/webrtc/p2p/quic/quicsession_unittest.cc b/p2p/quic/quicsession_unittest.cc
similarity index 100%
rename from webrtc/p2p/quic/quicsession_unittest.cc
rename to p2p/quic/quicsession_unittest.cc
diff --git a/webrtc/p2p/quic/quictransport.cc b/p2p/quic/quictransport.cc
similarity index 100%
rename from webrtc/p2p/quic/quictransport.cc
rename to p2p/quic/quictransport.cc
diff --git a/webrtc/p2p/quic/quictransport.h b/p2p/quic/quictransport.h
similarity index 100%
rename from webrtc/p2p/quic/quictransport.h
rename to p2p/quic/quictransport.h
diff --git a/webrtc/p2p/quic/quictransport_unittest.cc b/p2p/quic/quictransport_unittest.cc
similarity index 100%
rename from webrtc/p2p/quic/quictransport_unittest.cc
rename to p2p/quic/quictransport_unittest.cc
diff --git a/webrtc/p2p/quic/quictransportchannel.cc b/p2p/quic/quictransportchannel.cc
similarity index 100%
rename from webrtc/p2p/quic/quictransportchannel.cc
rename to p2p/quic/quictransportchannel.cc
diff --git a/webrtc/p2p/quic/quictransportchannel.h b/p2p/quic/quictransportchannel.h
similarity index 100%
rename from webrtc/p2p/quic/quictransportchannel.h
rename to p2p/quic/quictransportchannel.h
diff --git a/webrtc/p2p/quic/quictransportchannel_unittest.cc b/p2p/quic/quictransportchannel_unittest.cc
similarity index 100%
rename from webrtc/p2p/quic/quictransportchannel_unittest.cc
rename to p2p/quic/quictransportchannel_unittest.cc
diff --git a/webrtc/p2p/quic/reliablequicstream.cc b/p2p/quic/reliablequicstream.cc
similarity index 100%
rename from webrtc/p2p/quic/reliablequicstream.cc
rename to p2p/quic/reliablequicstream.cc
diff --git a/webrtc/p2p/quic/reliablequicstream.h b/p2p/quic/reliablequicstream.h
similarity index 100%
rename from webrtc/p2p/quic/reliablequicstream.h
rename to p2p/quic/reliablequicstream.h
diff --git a/webrtc/p2p/quic/reliablequicstream_unittest.cc b/p2p/quic/reliablequicstream_unittest.cc
similarity index 100%
rename from webrtc/p2p/quic/reliablequicstream_unittest.cc
rename to p2p/quic/reliablequicstream_unittest.cc
diff --git a/webrtc/p2p/stunprober/stunprober.cc b/p2p/stunprober/stunprober.cc
similarity index 100%
rename from webrtc/p2p/stunprober/stunprober.cc
rename to p2p/stunprober/stunprober.cc
diff --git a/webrtc/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h
similarity index 100%
rename from webrtc/p2p/stunprober/stunprober.h
rename to p2p/stunprober/stunprober.h
diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/p2p/stunprober/stunprober_unittest.cc
similarity index 100%
rename from webrtc/p2p/stunprober/stunprober_unittest.cc
rename to p2p/stunprober/stunprober_unittest.cc
diff --git a/webrtc/pc/BUILD.gn b/pc/BUILD.gn
similarity index 100%
rename from webrtc/pc/BUILD.gn
rename to pc/BUILD.gn
diff --git a/webrtc/pc/DEPS b/pc/DEPS
similarity index 100%
rename from webrtc/pc/DEPS
rename to pc/DEPS
diff --git a/webrtc/pc/OWNERS b/pc/OWNERS
similarity index 100%
rename from webrtc/pc/OWNERS
rename to pc/OWNERS
diff --git a/webrtc/pc/audiomonitor.cc b/pc/audiomonitor.cc
similarity index 100%
rename from webrtc/pc/audiomonitor.cc
rename to pc/audiomonitor.cc
diff --git a/webrtc/pc/audiomonitor.h b/pc/audiomonitor.h
similarity index 100%
rename from webrtc/pc/audiomonitor.h
rename to pc/audiomonitor.h
diff --git a/webrtc/pc/audiotrack.cc b/pc/audiotrack.cc
similarity index 100%
rename from webrtc/pc/audiotrack.cc
rename to pc/audiotrack.cc
diff --git a/webrtc/pc/audiotrack.h b/pc/audiotrack.h
similarity index 100%
rename from webrtc/pc/audiotrack.h
rename to pc/audiotrack.h
diff --git a/webrtc/pc/bundlefilter.cc b/pc/bundlefilter.cc
similarity index 100%
rename from webrtc/pc/bundlefilter.cc
rename to pc/bundlefilter.cc
diff --git a/webrtc/pc/bundlefilter.h b/pc/bundlefilter.h
similarity index 100%
rename from webrtc/pc/bundlefilter.h
rename to pc/bundlefilter.h
diff --git a/webrtc/pc/bundlefilter_unittest.cc b/pc/bundlefilter_unittest.cc
similarity index 100%
rename from webrtc/pc/bundlefilter_unittest.cc
rename to pc/bundlefilter_unittest.cc
diff --git a/webrtc/pc/channel.cc b/pc/channel.cc
similarity index 100%
rename from webrtc/pc/channel.cc
rename to pc/channel.cc
diff --git a/webrtc/pc/channel.h b/pc/channel.h
similarity index 100%
rename from webrtc/pc/channel.h
rename to pc/channel.h
diff --git a/webrtc/pc/channel_unittest.cc b/pc/channel_unittest.cc
similarity index 100%
rename from webrtc/pc/channel_unittest.cc
rename to pc/channel_unittest.cc
diff --git a/webrtc/pc/channelmanager.cc b/pc/channelmanager.cc
similarity index 100%
rename from webrtc/pc/channelmanager.cc
rename to pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.h b/pc/channelmanager.h
similarity index 100%
rename from webrtc/pc/channelmanager.h
rename to pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager_unittest.cc b/pc/channelmanager_unittest.cc
similarity index 100%
rename from webrtc/pc/channelmanager_unittest.cc
rename to pc/channelmanager_unittest.cc
diff --git a/webrtc/pc/createpeerconnectionfactory.cc b/pc/createpeerconnectionfactory.cc
similarity index 100%
rename from webrtc/pc/createpeerconnectionfactory.cc
rename to pc/createpeerconnectionfactory.cc
diff --git a/webrtc/pc/currentspeakermonitor.cc b/pc/currentspeakermonitor.cc
similarity index 100%
rename from webrtc/pc/currentspeakermonitor.cc
rename to pc/currentspeakermonitor.cc
diff --git a/webrtc/pc/currentspeakermonitor.h b/pc/currentspeakermonitor.h
similarity index 100%
rename from webrtc/pc/currentspeakermonitor.h
rename to pc/currentspeakermonitor.h
diff --git a/webrtc/pc/currentspeakermonitor_unittest.cc b/pc/currentspeakermonitor_unittest.cc
similarity index 100%
rename from webrtc/pc/currentspeakermonitor_unittest.cc
rename to pc/currentspeakermonitor_unittest.cc
diff --git a/webrtc/pc/datachannel.cc b/pc/datachannel.cc
similarity index 100%
rename from webrtc/pc/datachannel.cc
rename to pc/datachannel.cc
diff --git a/webrtc/pc/datachannel.h b/pc/datachannel.h
similarity index 100%
rename from webrtc/pc/datachannel.h
rename to pc/datachannel.h
diff --git a/webrtc/pc/datachannel_unittest.cc b/pc/datachannel_unittest.cc
similarity index 100%
rename from webrtc/pc/datachannel_unittest.cc
rename to pc/datachannel_unittest.cc
diff --git a/webrtc/pc/dtmfsender.cc b/pc/dtmfsender.cc
similarity index 100%
rename from webrtc/pc/dtmfsender.cc
rename to pc/dtmfsender.cc
diff --git a/webrtc/pc/dtmfsender.h b/pc/dtmfsender.h
similarity index 100%
rename from webrtc/pc/dtmfsender.h
rename to pc/dtmfsender.h
diff --git a/webrtc/pc/dtmfsender_unittest.cc b/pc/dtmfsender_unittest.cc
similarity index 100%
rename from webrtc/pc/dtmfsender_unittest.cc
rename to pc/dtmfsender_unittest.cc
diff --git a/webrtc/pc/externalhmac.cc b/pc/externalhmac.cc
similarity index 100%
rename from webrtc/pc/externalhmac.cc
rename to pc/externalhmac.cc
diff --git a/webrtc/pc/externalhmac.h b/pc/externalhmac.h
similarity index 100%
rename from webrtc/pc/externalhmac.h
rename to pc/externalhmac.h
diff --git a/webrtc/pc/iceserverparsing.cc b/pc/iceserverparsing.cc
similarity index 100%
rename from webrtc/pc/iceserverparsing.cc
rename to pc/iceserverparsing.cc
diff --git a/webrtc/pc/iceserverparsing.h b/pc/iceserverparsing.h
similarity index 100%
rename from webrtc/pc/iceserverparsing.h
rename to pc/iceserverparsing.h
diff --git a/webrtc/pc/iceserverparsing_unittest.cc b/pc/iceserverparsing_unittest.cc
similarity index 100%
rename from webrtc/pc/iceserverparsing_unittest.cc
rename to pc/iceserverparsing_unittest.cc
diff --git a/webrtc/pc/jsepicecandidate.cc b/pc/jsepicecandidate.cc
similarity index 100%
rename from webrtc/pc/jsepicecandidate.cc
rename to pc/jsepicecandidate.cc
diff --git a/webrtc/pc/jsepsessiondescription.cc b/pc/jsepsessiondescription.cc
similarity index 100%
rename from webrtc/pc/jsepsessiondescription.cc
rename to pc/jsepsessiondescription.cc
diff --git a/webrtc/pc/jsepsessiondescription_unittest.cc b/pc/jsepsessiondescription_unittest.cc
similarity index 100%
rename from webrtc/pc/jsepsessiondescription_unittest.cc
rename to pc/jsepsessiondescription_unittest.cc
diff --git a/webrtc/pc/localaudiosource.cc b/pc/localaudiosource.cc
similarity index 100%
rename from webrtc/pc/localaudiosource.cc
rename to pc/localaudiosource.cc
diff --git a/webrtc/pc/localaudiosource.h b/pc/localaudiosource.h
similarity index 100%
rename from webrtc/pc/localaudiosource.h
rename to pc/localaudiosource.h
diff --git a/webrtc/pc/localaudiosource_unittest.cc b/pc/localaudiosource_unittest.cc
similarity index 100%
rename from webrtc/pc/localaudiosource_unittest.cc
rename to pc/localaudiosource_unittest.cc
diff --git a/webrtc/pc/mediaconstraintsinterface_unittest.cc b/pc/mediaconstraintsinterface_unittest.cc
similarity index 100%
rename from webrtc/pc/mediaconstraintsinterface_unittest.cc
rename to pc/mediaconstraintsinterface_unittest.cc
diff --git a/webrtc/pc/mediamonitor.cc b/pc/mediamonitor.cc
similarity index 100%
rename from webrtc/pc/mediamonitor.cc
rename to pc/mediamonitor.cc
diff --git a/webrtc/pc/mediamonitor.h b/pc/mediamonitor.h
similarity index 100%
rename from webrtc/pc/mediamonitor.h
rename to pc/mediamonitor.h
diff --git a/webrtc/pc/mediasession.cc b/pc/mediasession.cc
similarity index 100%
rename from webrtc/pc/mediasession.cc
rename to pc/mediasession.cc
diff --git a/webrtc/pc/mediasession.h b/pc/mediasession.h
similarity index 100%
rename from webrtc/pc/mediasession.h
rename to pc/mediasession.h
diff --git a/webrtc/pc/mediasession_unittest.cc b/pc/mediasession_unittest.cc
similarity index 100%
rename from webrtc/pc/mediasession_unittest.cc
rename to pc/mediasession_unittest.cc
diff --git a/webrtc/pc/mediastream.cc b/pc/mediastream.cc
similarity index 100%
rename from webrtc/pc/mediastream.cc
rename to pc/mediastream.cc
diff --git a/webrtc/pc/mediastream.h b/pc/mediastream.h
similarity index 100%
rename from webrtc/pc/mediastream.h
rename to pc/mediastream.h
diff --git a/webrtc/pc/mediastream_unittest.cc b/pc/mediastream_unittest.cc
similarity index 100%
rename from webrtc/pc/mediastream_unittest.cc
rename to pc/mediastream_unittest.cc
diff --git a/webrtc/pc/mediastreamobserver.cc b/pc/mediastreamobserver.cc
similarity index 100%
rename from webrtc/pc/mediastreamobserver.cc
rename to pc/mediastreamobserver.cc
diff --git a/webrtc/pc/mediastreamobserver.h b/pc/mediastreamobserver.h
similarity index 100%
rename from webrtc/pc/mediastreamobserver.h
rename to pc/mediastreamobserver.h
diff --git a/webrtc/pc/mediastreamtrack.h b/pc/mediastreamtrack.h
similarity index 100%
rename from webrtc/pc/mediastreamtrack.h
rename to pc/mediastreamtrack.h
diff --git a/webrtc/pc/peerconnection.cc b/pc/peerconnection.cc
similarity index 100%
rename from webrtc/pc/peerconnection.cc
rename to pc/peerconnection.cc
diff --git a/webrtc/pc/peerconnection.h b/pc/peerconnection.h
similarity index 100%
rename from webrtc/pc/peerconnection.h
rename to pc/peerconnection.h
diff --git a/webrtc/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
similarity index 100%
rename from webrtc/pc/peerconnection_integrationtest.cc
rename to pc/peerconnection_integrationtest.cc
diff --git a/webrtc/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc
similarity index 100%
rename from webrtc/pc/peerconnectionendtoend_unittest.cc
rename to pc/peerconnectionendtoend_unittest.cc
diff --git a/webrtc/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc
similarity index 100%
rename from webrtc/pc/peerconnectionfactory.cc
rename to pc/peerconnectionfactory.cc
diff --git a/webrtc/pc/peerconnectionfactory.h b/pc/peerconnectionfactory.h
similarity index 100%
rename from webrtc/pc/peerconnectionfactory.h
rename to pc/peerconnectionfactory.h
diff --git a/webrtc/pc/peerconnectionfactory_unittest.cc b/pc/peerconnectionfactory_unittest.cc
similarity index 100%
rename from webrtc/pc/peerconnectionfactory_unittest.cc
rename to pc/peerconnectionfactory_unittest.cc
diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc
similarity index 100%
rename from webrtc/pc/peerconnectioninterface_unittest.cc
rename to pc/peerconnectioninterface_unittest.cc
diff --git a/webrtc/pc/proxy_unittest.cc b/pc/proxy_unittest.cc
similarity index 100%
rename from webrtc/pc/proxy_unittest.cc
rename to pc/proxy_unittest.cc
diff --git a/webrtc/pc/quicdatachannel.cc b/pc/quicdatachannel.cc
similarity index 100%
rename from webrtc/pc/quicdatachannel.cc
rename to pc/quicdatachannel.cc
diff --git a/webrtc/pc/quicdatachannel.h b/pc/quicdatachannel.h
similarity index 100%
rename from webrtc/pc/quicdatachannel.h
rename to pc/quicdatachannel.h
diff --git a/webrtc/pc/quicdatachannel_unittest.cc b/pc/quicdatachannel_unittest.cc
similarity index 100%
rename from webrtc/pc/quicdatachannel_unittest.cc
rename to pc/quicdatachannel_unittest.cc
diff --git a/webrtc/pc/quicdatatransport.cc b/pc/quicdatatransport.cc
similarity index 100%
rename from webrtc/pc/quicdatatransport.cc
rename to pc/quicdatatransport.cc
diff --git a/webrtc/pc/quicdatatransport.h b/pc/quicdatatransport.h
similarity index 100%
rename from webrtc/pc/quicdatatransport.h
rename to pc/quicdatatransport.h
diff --git a/webrtc/pc/quicdatatransport_unittest.cc b/pc/quicdatatransport_unittest.cc
similarity index 100%
rename from webrtc/pc/quicdatatransport_unittest.cc
rename to pc/quicdatatransport_unittest.cc
diff --git a/webrtc/pc/remoteaudiosource.cc b/pc/remoteaudiosource.cc
similarity index 100%
rename from webrtc/pc/remoteaudiosource.cc
rename to pc/remoteaudiosource.cc
diff --git a/webrtc/pc/remoteaudiosource.h b/pc/remoteaudiosource.h
similarity index 100%
rename from webrtc/pc/remoteaudiosource.h
rename to pc/remoteaudiosource.h
diff --git a/webrtc/pc/rtcpmuxfilter.cc b/pc/rtcpmuxfilter.cc
similarity index 100%
rename from webrtc/pc/rtcpmuxfilter.cc
rename to pc/rtcpmuxfilter.cc
diff --git a/webrtc/pc/rtcpmuxfilter.h b/pc/rtcpmuxfilter.h
similarity index 100%
rename from webrtc/pc/rtcpmuxfilter.h
rename to pc/rtcpmuxfilter.h
diff --git a/webrtc/pc/rtcpmuxfilter_unittest.cc b/pc/rtcpmuxfilter_unittest.cc
similarity index 100%
rename from webrtc/pc/rtcpmuxfilter_unittest.cc
rename to pc/rtcpmuxfilter_unittest.cc
diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/pc/rtcstats_integrationtest.cc
similarity index 100%
rename from webrtc/pc/rtcstats_integrationtest.cc
rename to pc/rtcstats_integrationtest.cc
diff --git a/webrtc/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc
similarity index 100%
rename from webrtc/pc/rtcstatscollector.cc
rename to pc/rtcstatscollector.cc
diff --git a/webrtc/pc/rtcstatscollector.h b/pc/rtcstatscollector.h
similarity index 100%
rename from webrtc/pc/rtcstatscollector.h
rename to pc/rtcstatscollector.h
diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
similarity index 100%
rename from webrtc/pc/rtcstatscollector_unittest.cc
rename to pc/rtcstatscollector_unittest.cc
diff --git a/webrtc/pc/rtpreceiver.cc b/pc/rtpreceiver.cc
similarity index 100%
rename from webrtc/pc/rtpreceiver.cc
rename to pc/rtpreceiver.cc
diff --git a/webrtc/pc/rtpreceiver.h b/pc/rtpreceiver.h
similarity index 100%
rename from webrtc/pc/rtpreceiver.h
rename to pc/rtpreceiver.h
diff --git a/webrtc/pc/rtpsender.cc b/pc/rtpsender.cc
similarity index 100%
rename from webrtc/pc/rtpsender.cc
rename to pc/rtpsender.cc
diff --git a/webrtc/pc/rtpsender.h b/pc/rtpsender.h
similarity index 100%
rename from webrtc/pc/rtpsender.h
rename to pc/rtpsender.h
diff --git a/webrtc/pc/rtpsenderreceiver_unittest.cc b/pc/rtpsenderreceiver_unittest.cc
similarity index 100%
rename from webrtc/pc/rtpsenderreceiver_unittest.cc
rename to pc/rtpsenderreceiver_unittest.cc
diff --git a/webrtc/pc/rtptransport.cc b/pc/rtptransport.cc
similarity index 100%
rename from webrtc/pc/rtptransport.cc
rename to pc/rtptransport.cc
diff --git a/webrtc/pc/rtptransport.h b/pc/rtptransport.h
similarity index 100%
rename from webrtc/pc/rtptransport.h
rename to pc/rtptransport.h
diff --git a/webrtc/pc/rtptransport_unittest.cc b/pc/rtptransport_unittest.cc
similarity index 100%
rename from webrtc/pc/rtptransport_unittest.cc
rename to pc/rtptransport_unittest.cc
diff --git a/webrtc/pc/rtptransportinternal.h b/pc/rtptransportinternal.h
similarity index 100%
rename from webrtc/pc/rtptransportinternal.h
rename to pc/rtptransportinternal.h
diff --git a/webrtc/pc/rtptransporttestutil.h b/pc/rtptransporttestutil.h
similarity index 100%
rename from webrtc/pc/rtptransporttestutil.h
rename to pc/rtptransporttestutil.h
diff --git a/webrtc/pc/sctputils.cc b/pc/sctputils.cc
similarity index 100%
rename from webrtc/pc/sctputils.cc
rename to pc/sctputils.cc
diff --git a/webrtc/pc/sctputils.h b/pc/sctputils.h
similarity index 100%
rename from webrtc/pc/sctputils.h
rename to pc/sctputils.h
diff --git a/webrtc/pc/sctputils_unittest.cc b/pc/sctputils_unittest.cc
similarity index 100%
rename from webrtc/pc/sctputils_unittest.cc
rename to pc/sctputils_unittest.cc
diff --git a/webrtc/pc/srtpfilter.cc b/pc/srtpfilter.cc
similarity index 100%
rename from webrtc/pc/srtpfilter.cc
rename to pc/srtpfilter.cc
diff --git a/webrtc/pc/srtpfilter.h b/pc/srtpfilter.h
similarity index 100%
rename from webrtc/pc/srtpfilter.h
rename to pc/srtpfilter.h
diff --git a/webrtc/pc/srtpfilter_unittest.cc b/pc/srtpfilter_unittest.cc
similarity index 100%
rename from webrtc/pc/srtpfilter_unittest.cc
rename to pc/srtpfilter_unittest.cc
diff --git a/webrtc/pc/srtpsession.cc b/pc/srtpsession.cc
similarity index 100%
rename from webrtc/pc/srtpsession.cc
rename to pc/srtpsession.cc
diff --git a/webrtc/pc/srtpsession.h b/pc/srtpsession.h
similarity index 100%
rename from webrtc/pc/srtpsession.h
rename to pc/srtpsession.h
diff --git a/webrtc/pc/srtpsession_unittest.cc b/pc/srtpsession_unittest.cc
similarity index 100%
rename from webrtc/pc/srtpsession_unittest.cc
rename to pc/srtpsession_unittest.cc
diff --git a/webrtc/pc/srtptestutil.h b/pc/srtptestutil.h
similarity index 100%
rename from webrtc/pc/srtptestutil.h
rename to pc/srtptestutil.h
diff --git a/webrtc/pc/srtptransport.cc b/pc/srtptransport.cc
similarity index 100%
rename from webrtc/pc/srtptransport.cc
rename to pc/srtptransport.cc
diff --git a/webrtc/pc/srtptransport.h b/pc/srtptransport.h
similarity index 100%
rename from webrtc/pc/srtptransport.h
rename to pc/srtptransport.h
diff --git a/webrtc/pc/srtptransport_unittest.cc b/pc/srtptransport_unittest.cc
similarity index 100%
rename from webrtc/pc/srtptransport_unittest.cc
rename to pc/srtptransport_unittest.cc
diff --git a/webrtc/pc/statscollector.cc b/pc/statscollector.cc
similarity index 100%
rename from webrtc/pc/statscollector.cc
rename to pc/statscollector.cc
diff --git a/webrtc/pc/statscollector.h b/pc/statscollector.h
similarity index 100%
rename from webrtc/pc/statscollector.h
rename to pc/statscollector.h
diff --git a/webrtc/pc/statscollector_unittest.cc b/pc/statscollector_unittest.cc
similarity index 100%
rename from webrtc/pc/statscollector_unittest.cc
rename to pc/statscollector_unittest.cc
diff --git a/webrtc/pc/streamcollection.h b/pc/streamcollection.h
similarity index 100%
rename from webrtc/pc/streamcollection.h
rename to pc/streamcollection.h
diff --git a/webrtc/pc/test/DEPS b/pc/test/DEPS
similarity index 100%
rename from webrtc/pc/test/DEPS
rename to pc/test/DEPS
diff --git a/webrtc/pc/test/androidtestinitializer.cc b/pc/test/androidtestinitializer.cc
similarity index 100%
rename from webrtc/pc/test/androidtestinitializer.cc
rename to pc/test/androidtestinitializer.cc
diff --git a/webrtc/pc/test/androidtestinitializer.h b/pc/test/androidtestinitializer.h
similarity index 100%
rename from webrtc/pc/test/androidtestinitializer.h
rename to pc/test/androidtestinitializer.h
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.cc b/pc/test/fakeaudiocapturemodule.cc
similarity index 100%
rename from webrtc/pc/test/fakeaudiocapturemodule.cc
rename to pc/test/fakeaudiocapturemodule.cc
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h
similarity index 100%
rename from webrtc/pc/test/fakeaudiocapturemodule.h
rename to pc/test/fakeaudiocapturemodule.h
diff --git a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc b/pc/test/fakeaudiocapturemodule_unittest.cc
similarity index 100%
rename from webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
rename to pc/test/fakeaudiocapturemodule_unittest.cc
diff --git a/webrtc/pc/test/fakedatachannelprovider.h b/pc/test/fakedatachannelprovider.h
similarity index 100%
rename from webrtc/pc/test/fakedatachannelprovider.h
rename to pc/test/fakedatachannelprovider.h
diff --git a/webrtc/pc/test/fakeperiodicvideocapturer.h b/pc/test/fakeperiodicvideocapturer.h
similarity index 100%
rename from webrtc/pc/test/fakeperiodicvideocapturer.h
rename to pc/test/fakeperiodicvideocapturer.h
diff --git a/webrtc/pc/test/fakertccertificategenerator.h b/pc/test/fakertccertificategenerator.h
similarity index 100%
rename from webrtc/pc/test/fakertccertificategenerator.h
rename to pc/test/fakertccertificategenerator.h
diff --git a/webrtc/pc/test/fakevideotrackrenderer.h b/pc/test/fakevideotrackrenderer.h
similarity index 100%
rename from webrtc/pc/test/fakevideotrackrenderer.h
rename to pc/test/fakevideotrackrenderer.h
diff --git a/webrtc/pc/test/fakevideotracksource.h b/pc/test/fakevideotracksource.h
similarity index 100%
rename from webrtc/pc/test/fakevideotracksource.h
rename to pc/test/fakevideotracksource.h
diff --git a/webrtc/pc/test/mock_datachannel.h b/pc/test/mock_datachannel.h
similarity index 100%
rename from webrtc/pc/test/mock_datachannel.h
rename to pc/test/mock_datachannel.h
diff --git a/webrtc/pc/test/mock_peerconnection.h b/pc/test/mock_peerconnection.h
similarity index 100%
rename from webrtc/pc/test/mock_peerconnection.h
rename to pc/test/mock_peerconnection.h
diff --git a/webrtc/pc/test/mock_webrtcsession.h b/pc/test/mock_webrtcsession.h
similarity index 100%
rename from webrtc/pc/test/mock_webrtcsession.h
rename to pc/test/mock_webrtcsession.h
diff --git a/webrtc/pc/test/mockpeerconnectionobservers.h b/pc/test/mockpeerconnectionobservers.h
similarity index 100%
rename from webrtc/pc/test/mockpeerconnectionobservers.h
rename to pc/test/mockpeerconnectionobservers.h
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc
similarity index 100%
rename from webrtc/pc/test/peerconnectiontestwrapper.cc
rename to pc/test/peerconnectiontestwrapper.cc
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.h b/pc/test/peerconnectiontestwrapper.h
similarity index 100%
rename from webrtc/pc/test/peerconnectiontestwrapper.h
rename to pc/test/peerconnectiontestwrapper.h
diff --git a/webrtc/pc/test/rtcstatsobtainer.h b/pc/test/rtcstatsobtainer.h
similarity index 100%
rename from webrtc/pc/test/rtcstatsobtainer.h
rename to pc/test/rtcstatsobtainer.h
diff --git a/webrtc/pc/test/testsdpstrings.h b/pc/test/testsdpstrings.h
similarity index 100%
rename from webrtc/pc/test/testsdpstrings.h
rename to pc/test/testsdpstrings.h
diff --git a/webrtc/pc/trackmediainfomap.cc b/pc/trackmediainfomap.cc
similarity index 100%
rename from webrtc/pc/trackmediainfomap.cc
rename to pc/trackmediainfomap.cc
diff --git a/webrtc/pc/trackmediainfomap.h b/pc/trackmediainfomap.h
similarity index 100%
rename from webrtc/pc/trackmediainfomap.h
rename to pc/trackmediainfomap.h
diff --git a/webrtc/pc/trackmediainfomap_unittest.cc b/pc/trackmediainfomap_unittest.cc
similarity index 100%
rename from webrtc/pc/trackmediainfomap_unittest.cc
rename to pc/trackmediainfomap_unittest.cc
diff --git a/webrtc/pc/videocapturertracksource.cc b/pc/videocapturertracksource.cc
similarity index 100%
rename from webrtc/pc/videocapturertracksource.cc
rename to pc/videocapturertracksource.cc
diff --git a/webrtc/pc/videocapturertracksource.h b/pc/videocapturertracksource.h
similarity index 100%
rename from webrtc/pc/videocapturertracksource.h
rename to pc/videocapturertracksource.h
diff --git a/webrtc/pc/videocapturertracksource_unittest.cc b/pc/videocapturertracksource_unittest.cc
similarity index 100%
rename from webrtc/pc/videocapturertracksource_unittest.cc
rename to pc/videocapturertracksource_unittest.cc
diff --git a/webrtc/pc/videotrack.cc b/pc/videotrack.cc
similarity index 100%
rename from webrtc/pc/videotrack.cc
rename to pc/videotrack.cc
diff --git a/webrtc/pc/videotrack.h b/pc/videotrack.h
similarity index 100%
rename from webrtc/pc/videotrack.h
rename to pc/videotrack.h
diff --git a/webrtc/pc/videotrack_unittest.cc b/pc/videotrack_unittest.cc
similarity index 100%
rename from webrtc/pc/videotrack_unittest.cc
rename to pc/videotrack_unittest.cc
diff --git a/webrtc/pc/videotracksource.cc b/pc/videotracksource.cc
similarity index 100%
rename from webrtc/pc/videotracksource.cc
rename to pc/videotracksource.cc
diff --git a/webrtc/pc/videotracksource.h b/pc/videotracksource.h
similarity index 100%
rename from webrtc/pc/videotracksource.h
rename to pc/videotracksource.h
diff --git a/webrtc/pc/voicechannel.h b/pc/voicechannel.h
similarity index 100%
rename from webrtc/pc/voicechannel.h
rename to pc/voicechannel.h
diff --git a/webrtc/pc/webrtcsdp.cc b/pc/webrtcsdp.cc
similarity index 100%
rename from webrtc/pc/webrtcsdp.cc
rename to pc/webrtcsdp.cc
diff --git a/webrtc/pc/webrtcsdp.h b/pc/webrtcsdp.h
similarity index 100%
rename from webrtc/pc/webrtcsdp.h
rename to pc/webrtcsdp.h
diff --git a/webrtc/pc/webrtcsdp_unittest.cc b/pc/webrtcsdp_unittest.cc
similarity index 100%
rename from webrtc/pc/webrtcsdp_unittest.cc
rename to pc/webrtcsdp_unittest.cc
diff --git a/webrtc/pc/webrtcsession.cc b/pc/webrtcsession.cc
similarity index 100%
rename from webrtc/pc/webrtcsession.cc
rename to pc/webrtcsession.cc
diff --git a/webrtc/pc/webrtcsession.h b/pc/webrtcsession.h
similarity index 100%
rename from webrtc/pc/webrtcsession.h
rename to pc/webrtcsession.h
diff --git a/webrtc/pc/webrtcsession_unittest.cc b/pc/webrtcsession_unittest.cc
similarity index 100%
rename from webrtc/pc/webrtcsession_unittest.cc
rename to pc/webrtcsession_unittest.cc
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.cc b/pc/webrtcsessiondescriptionfactory.cc
similarity index 100%
rename from webrtc/pc/webrtcsessiondescriptionfactory.cc
rename to pc/webrtcsessiondescriptionfactory.cc
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.h b/pc/webrtcsessiondescriptionfactory.h
similarity index 100%
rename from webrtc/pc/webrtcsessiondescriptionfactory.h
rename to pc/webrtcsessiondescriptionfactory.h
diff --git a/webrtc/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
similarity index 100%
rename from webrtc/rtc_base/BUILD.gn
rename to rtc_base/BUILD.gn
diff --git a/webrtc/rtc_base/DEPS b/rtc_base/DEPS
similarity index 100%
rename from webrtc/rtc_base/DEPS
rename to rtc_base/DEPS
diff --git a/webrtc/rtc_base/Dummy.java b/rtc_base/Dummy.java
similarity index 100%
rename from webrtc/rtc_base/Dummy.java
rename to rtc_base/Dummy.java
diff --git a/webrtc/rtc_base/OWNERS b/rtc_base/OWNERS
similarity index 100%
rename from webrtc/rtc_base/OWNERS
rename to rtc_base/OWNERS
diff --git a/webrtc/rtc_base/array_view.h b/rtc_base/array_view.h
similarity index 100%
rename from webrtc/rtc_base/array_view.h
rename to rtc_base/array_view.h
diff --git a/webrtc/rtc_base/arraysize.h b/rtc_base/arraysize.h
similarity index 100%
rename from webrtc/rtc_base/arraysize.h
rename to rtc_base/arraysize.h
diff --git a/webrtc/rtc_base/asyncinvoker-inl.h b/rtc_base/asyncinvoker-inl.h
similarity index 100%
rename from webrtc/rtc_base/asyncinvoker-inl.h
rename to rtc_base/asyncinvoker-inl.h
diff --git a/webrtc/rtc_base/asyncinvoker.cc b/rtc_base/asyncinvoker.cc
similarity index 100%
rename from webrtc/rtc_base/asyncinvoker.cc
rename to rtc_base/asyncinvoker.cc
diff --git a/webrtc/rtc_base/asyncinvoker.h b/rtc_base/asyncinvoker.h
similarity index 100%
rename from webrtc/rtc_base/asyncinvoker.h
rename to rtc_base/asyncinvoker.h
diff --git a/webrtc/rtc_base/asyncpacketsocket.cc b/rtc_base/asyncpacketsocket.cc
similarity index 100%
rename from webrtc/rtc_base/asyncpacketsocket.cc
rename to rtc_base/asyncpacketsocket.cc
diff --git a/webrtc/rtc_base/asyncpacketsocket.h b/rtc_base/asyncpacketsocket.h
similarity index 100%
rename from webrtc/rtc_base/asyncpacketsocket.h
rename to rtc_base/asyncpacketsocket.h
diff --git a/webrtc/rtc_base/asyncresolverinterface.cc b/rtc_base/asyncresolverinterface.cc
similarity index 100%
rename from webrtc/rtc_base/asyncresolverinterface.cc
rename to rtc_base/asyncresolverinterface.cc
diff --git a/webrtc/rtc_base/asyncresolverinterface.h b/rtc_base/asyncresolverinterface.h
similarity index 100%
rename from webrtc/rtc_base/asyncresolverinterface.h
rename to rtc_base/asyncresolverinterface.h
diff --git a/webrtc/rtc_base/asyncsocket.cc b/rtc_base/asyncsocket.cc
similarity index 100%
rename from webrtc/rtc_base/asyncsocket.cc
rename to rtc_base/asyncsocket.cc
diff --git a/webrtc/rtc_base/asyncsocket.h b/rtc_base/asyncsocket.h
similarity index 100%
rename from webrtc/rtc_base/asyncsocket.h
rename to rtc_base/asyncsocket.h
diff --git a/webrtc/rtc_base/asynctcpsocket.cc b/rtc_base/asynctcpsocket.cc
similarity index 100%
rename from webrtc/rtc_base/asynctcpsocket.cc
rename to rtc_base/asynctcpsocket.cc
diff --git a/webrtc/rtc_base/asynctcpsocket.h b/rtc_base/asynctcpsocket.h
similarity index 100%
rename from webrtc/rtc_base/asynctcpsocket.h
rename to rtc_base/asynctcpsocket.h
diff --git a/webrtc/rtc_base/asynctcpsocket_unittest.cc b/rtc_base/asynctcpsocket_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/asynctcpsocket_unittest.cc
rename to rtc_base/asynctcpsocket_unittest.cc
diff --git a/webrtc/rtc_base/asyncudpsocket.cc b/rtc_base/asyncudpsocket.cc
similarity index 100%
rename from webrtc/rtc_base/asyncudpsocket.cc
rename to rtc_base/asyncudpsocket.cc
diff --git a/webrtc/rtc_base/asyncudpsocket.h b/rtc_base/asyncudpsocket.h
similarity index 100%
rename from webrtc/rtc_base/asyncudpsocket.h
rename to rtc_base/asyncudpsocket.h
diff --git a/webrtc/rtc_base/asyncudpsocket_unittest.cc b/rtc_base/asyncudpsocket_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/asyncudpsocket_unittest.cc
rename to rtc_base/asyncudpsocket_unittest.cc
diff --git a/webrtc/rtc_base/atomicops.h b/rtc_base/atomicops.h
similarity index 100%
rename from webrtc/rtc_base/atomicops.h
rename to rtc_base/atomicops.h
diff --git a/webrtc/rtc_base/atomicops_unittest.cc b/rtc_base/atomicops_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/atomicops_unittest.cc
rename to rtc_base/atomicops_unittest.cc
diff --git a/webrtc/rtc_base/base64.cc b/rtc_base/base64.cc
similarity index 100%
rename from webrtc/rtc_base/base64.cc
rename to rtc_base/base64.cc
diff --git a/webrtc/rtc_base/base64.h b/rtc_base/base64.h
similarity index 100%
rename from webrtc/rtc_base/base64.h
rename to rtc_base/base64.h
diff --git a/webrtc/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/base64_unittest.cc
rename to rtc_base/base64_unittest.cc
diff --git a/webrtc/rtc_base/basictypes.h b/rtc_base/basictypes.h
similarity index 100%
rename from webrtc/rtc_base/basictypes.h
rename to rtc_base/basictypes.h
diff --git a/webrtc/rtc_base/basictypes_unittest.cc b/rtc_base/basictypes_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/basictypes_unittest.cc
rename to rtc_base/basictypes_unittest.cc
diff --git a/webrtc/rtc_base/bind.h b/rtc_base/bind.h
similarity index 100%
rename from webrtc/rtc_base/bind.h
rename to rtc_base/bind.h
diff --git a/webrtc/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/bind_unittest.cc
rename to rtc_base/bind_unittest.cc
diff --git a/webrtc/rtc_base/bitbuffer.cc b/rtc_base/bitbuffer.cc
similarity index 100%
rename from webrtc/rtc_base/bitbuffer.cc
rename to rtc_base/bitbuffer.cc
diff --git a/webrtc/rtc_base/bitbuffer.h b/rtc_base/bitbuffer.h
similarity index 100%
rename from webrtc/rtc_base/bitbuffer.h
rename to rtc_base/bitbuffer.h
diff --git a/webrtc/rtc_base/bitbuffer_unittest.cc b/rtc_base/bitbuffer_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/bitbuffer_unittest.cc
rename to rtc_base/bitbuffer_unittest.cc
diff --git a/webrtc/rtc_base/buffer.h b/rtc_base/buffer.h
similarity index 100%
rename from webrtc/rtc_base/buffer.h
rename to rtc_base/buffer.h
diff --git a/webrtc/rtc_base/buffer_unittest.cc b/rtc_base/buffer_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/buffer_unittest.cc
rename to rtc_base/buffer_unittest.cc
diff --git a/webrtc/rtc_base/bufferqueue.cc b/rtc_base/bufferqueue.cc
similarity index 100%
rename from webrtc/rtc_base/bufferqueue.cc
rename to rtc_base/bufferqueue.cc
diff --git a/webrtc/rtc_base/bufferqueue.h b/rtc_base/bufferqueue.h
similarity index 100%
rename from webrtc/rtc_base/bufferqueue.h
rename to rtc_base/bufferqueue.h
diff --git a/webrtc/rtc_base/bufferqueue_unittest.cc b/rtc_base/bufferqueue_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/bufferqueue_unittest.cc
rename to rtc_base/bufferqueue_unittest.cc
diff --git a/webrtc/rtc_base/bytebuffer.cc b/rtc_base/bytebuffer.cc
similarity index 100%
rename from webrtc/rtc_base/bytebuffer.cc
rename to rtc_base/bytebuffer.cc
diff --git a/webrtc/rtc_base/bytebuffer.h b/rtc_base/bytebuffer.h
similarity index 100%
rename from webrtc/rtc_base/bytebuffer.h
rename to rtc_base/bytebuffer.h
diff --git a/webrtc/rtc_base/bytebuffer_unittest.cc b/rtc_base/bytebuffer_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/bytebuffer_unittest.cc
rename to rtc_base/bytebuffer_unittest.cc
diff --git a/webrtc/rtc_base/byteorder.h b/rtc_base/byteorder.h
similarity index 100%
rename from webrtc/rtc_base/byteorder.h
rename to rtc_base/byteorder.h
diff --git a/webrtc/rtc_base/byteorder_unittest.cc b/rtc_base/byteorder_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/byteorder_unittest.cc
rename to rtc_base/byteorder_unittest.cc
diff --git a/webrtc/rtc_base/callback.h b/rtc_base/callback.h
similarity index 100%
rename from webrtc/rtc_base/callback.h
rename to rtc_base/callback.h
diff --git a/webrtc/rtc_base/callback.h.pump b/rtc_base/callback.h.pump
similarity index 100%
rename from webrtc/rtc_base/callback.h.pump
rename to rtc_base/callback.h.pump
diff --git a/webrtc/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/callback_unittest.cc
rename to rtc_base/callback_unittest.cc
diff --git a/webrtc/rtc_base/checks.cc b/rtc_base/checks.cc
similarity index 100%
rename from webrtc/rtc_base/checks.cc
rename to rtc_base/checks.cc
diff --git a/webrtc/rtc_base/checks.h b/rtc_base/checks.h
similarity index 100%
rename from webrtc/rtc_base/checks.h
rename to rtc_base/checks.h
diff --git a/webrtc/rtc_base/compile_assert_c.h b/rtc_base/compile_assert_c.h
similarity index 100%
rename from webrtc/rtc_base/compile_assert_c.h
rename to rtc_base/compile_assert_c.h
diff --git a/webrtc/rtc_base/constructormagic.h b/rtc_base/constructormagic.h
similarity index 100%
rename from webrtc/rtc_base/constructormagic.h
rename to rtc_base/constructormagic.h
diff --git a/webrtc/rtc_base/copyonwritebuffer.cc b/rtc_base/copyonwritebuffer.cc
similarity index 100%
rename from webrtc/rtc_base/copyonwritebuffer.cc
rename to rtc_base/copyonwritebuffer.cc
diff --git a/webrtc/rtc_base/copyonwritebuffer.h b/rtc_base/copyonwritebuffer.h
similarity index 100%
rename from webrtc/rtc_base/copyonwritebuffer.h
rename to rtc_base/copyonwritebuffer.h
diff --git a/webrtc/rtc_base/copyonwritebuffer_unittest.cc b/rtc_base/copyonwritebuffer_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/copyonwritebuffer_unittest.cc
rename to rtc_base/copyonwritebuffer_unittest.cc
diff --git a/webrtc/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc
similarity index 100%
rename from webrtc/rtc_base/cpu_time.cc
rename to rtc_base/cpu_time.cc
diff --git a/webrtc/rtc_base/cpu_time.h b/rtc_base/cpu_time.h
similarity index 100%
rename from webrtc/rtc_base/cpu_time.h
rename to rtc_base/cpu_time.h
diff --git a/webrtc/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/cpu_time_unittest.cc
rename to rtc_base/cpu_time_unittest.cc
diff --git a/webrtc/rtc_base/crc32.cc b/rtc_base/crc32.cc
similarity index 100%
rename from webrtc/rtc_base/crc32.cc
rename to rtc_base/crc32.cc
diff --git a/webrtc/rtc_base/crc32.h b/rtc_base/crc32.h
similarity index 100%
rename from webrtc/rtc_base/crc32.h
rename to rtc_base/crc32.h
diff --git a/webrtc/rtc_base/crc32_unittest.cc b/rtc_base/crc32_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/crc32_unittest.cc
rename to rtc_base/crc32_unittest.cc
diff --git a/webrtc/rtc_base/criticalsection.cc b/rtc_base/criticalsection.cc
similarity index 100%
rename from webrtc/rtc_base/criticalsection.cc
rename to rtc_base/criticalsection.cc
diff --git a/webrtc/rtc_base/criticalsection.h b/rtc_base/criticalsection.h
similarity index 100%
rename from webrtc/rtc_base/criticalsection.h
rename to rtc_base/criticalsection.h
diff --git a/webrtc/rtc_base/criticalsection_unittest.cc b/rtc_base/criticalsection_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/criticalsection_unittest.cc
rename to rtc_base/criticalsection_unittest.cc
diff --git a/webrtc/rtc_base/cryptstring.cc b/rtc_base/cryptstring.cc
similarity index 100%
rename from webrtc/rtc_base/cryptstring.cc
rename to rtc_base/cryptstring.cc
diff --git a/webrtc/rtc_base/cryptstring.h b/rtc_base/cryptstring.h
similarity index 100%
rename from webrtc/rtc_base/cryptstring.h
rename to rtc_base/cryptstring.h
diff --git a/webrtc/rtc_base/deprecation.h b/rtc_base/deprecation.h
similarity index 100%
rename from webrtc/rtc_base/deprecation.h
rename to rtc_base/deprecation.h
diff --git a/webrtc/rtc_base/dscp.h b/rtc_base/dscp.h
similarity index 100%
rename from webrtc/rtc_base/dscp.h
rename to rtc_base/dscp.h
diff --git a/webrtc/rtc_base/event.cc b/rtc_base/event.cc
similarity index 100%
rename from webrtc/rtc_base/event.cc
rename to rtc_base/event.cc
diff --git a/webrtc/rtc_base/event.h b/rtc_base/event.h
similarity index 100%
rename from webrtc/rtc_base/event.h
rename to rtc_base/event.h
diff --git a/webrtc/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc
similarity index 100%
rename from webrtc/rtc_base/event_tracer.cc
rename to rtc_base/event_tracer.cc
diff --git a/webrtc/rtc_base/event_tracer.h b/rtc_base/event_tracer.h
similarity index 100%
rename from webrtc/rtc_base/event_tracer.h
rename to rtc_base/event_tracer.h
diff --git a/webrtc/rtc_base/event_tracer_unittest.cc b/rtc_base/event_tracer_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/event_tracer_unittest.cc
rename to rtc_base/event_tracer_unittest.cc
diff --git a/webrtc/rtc_base/event_unittest.cc b/rtc_base/event_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/event_unittest.cc
rename to rtc_base/event_unittest.cc
diff --git a/webrtc/rtc_base/fakeclock.cc b/rtc_base/fakeclock.cc
similarity index 100%
rename from webrtc/rtc_base/fakeclock.cc
rename to rtc_base/fakeclock.cc
diff --git a/webrtc/rtc_base/fakeclock.h b/rtc_base/fakeclock.h
similarity index 100%
rename from webrtc/rtc_base/fakeclock.h
rename to rtc_base/fakeclock.h
diff --git a/webrtc/rtc_base/fakenetwork.h b/rtc_base/fakenetwork.h
similarity index 100%
rename from webrtc/rtc_base/fakenetwork.h
rename to rtc_base/fakenetwork.h
diff --git a/webrtc/rtc_base/fakesslidentity.h b/rtc_base/fakesslidentity.h
similarity index 100%
rename from webrtc/rtc_base/fakesslidentity.h
rename to rtc_base/fakesslidentity.h
diff --git a/webrtc/rtc_base/file.cc b/rtc_base/file.cc
similarity index 100%
rename from webrtc/rtc_base/file.cc
rename to rtc_base/file.cc
diff --git a/webrtc/rtc_base/file.h b/rtc_base/file.h
similarity index 100%
rename from webrtc/rtc_base/file.h
rename to rtc_base/file.h
diff --git a/webrtc/rtc_base/file_posix.cc b/rtc_base/file_posix.cc
similarity index 100%
rename from webrtc/rtc_base/file_posix.cc
rename to rtc_base/file_posix.cc
diff --git a/webrtc/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/file_unittest.cc
rename to rtc_base/file_unittest.cc
diff --git a/webrtc/rtc_base/file_win.cc b/rtc_base/file_win.cc
similarity index 100%
rename from webrtc/rtc_base/file_win.cc
rename to rtc_base/file_win.cc
diff --git a/webrtc/rtc_base/filerotatingstream.cc b/rtc_base/filerotatingstream.cc
similarity index 100%
rename from webrtc/rtc_base/filerotatingstream.cc
rename to rtc_base/filerotatingstream.cc
diff --git a/webrtc/rtc_base/filerotatingstream.h b/rtc_base/filerotatingstream.h
similarity index 100%
rename from webrtc/rtc_base/filerotatingstream.h
rename to rtc_base/filerotatingstream.h
diff --git a/webrtc/rtc_base/filerotatingstream_unittest.cc b/rtc_base/filerotatingstream_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/filerotatingstream_unittest.cc
rename to rtc_base/filerotatingstream_unittest.cc
diff --git a/webrtc/rtc_base/fileutils.cc b/rtc_base/fileutils.cc
similarity index 100%
rename from webrtc/rtc_base/fileutils.cc
rename to rtc_base/fileutils.cc
diff --git a/webrtc/rtc_base/fileutils.h b/rtc_base/fileutils.h
similarity index 100%
rename from webrtc/rtc_base/fileutils.h
rename to rtc_base/fileutils.h
diff --git a/webrtc/rtc_base/firewallsocketserver.cc b/rtc_base/firewallsocketserver.cc
similarity index 100%
rename from webrtc/rtc_base/firewallsocketserver.cc
rename to rtc_base/firewallsocketserver.cc
diff --git a/webrtc/rtc_base/firewallsocketserver.h b/rtc_base/firewallsocketserver.h
similarity index 100%
rename from webrtc/rtc_base/firewallsocketserver.h
rename to rtc_base/firewallsocketserver.h
diff --git a/webrtc/rtc_base/flags.cc b/rtc_base/flags.cc
similarity index 100%
rename from webrtc/rtc_base/flags.cc
rename to rtc_base/flags.cc
diff --git a/webrtc/rtc_base/flags.h b/rtc_base/flags.h
similarity index 100%
rename from webrtc/rtc_base/flags.h
rename to rtc_base/flags.h
diff --git a/webrtc/rtc_base/format_macros.h b/rtc_base/format_macros.h
similarity index 100%
rename from webrtc/rtc_base/format_macros.h
rename to rtc_base/format_macros.h
diff --git a/webrtc/rtc_base/function_view.h b/rtc_base/function_view.h
similarity index 100%
rename from webrtc/rtc_base/function_view.h
rename to rtc_base/function_view.h
diff --git a/webrtc/rtc_base/function_view_unittest.cc b/rtc_base/function_view_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/function_view_unittest.cc
rename to rtc_base/function_view_unittest.cc
diff --git a/webrtc/rtc_base/gtest_prod_util.h b/rtc_base/gtest_prod_util.h
similarity index 100%
rename from webrtc/rtc_base/gtest_prod_util.h
rename to rtc_base/gtest_prod_util.h
diff --git a/webrtc/rtc_base/gunit.h b/rtc_base/gunit.h
similarity index 100%
rename from webrtc/rtc_base/gunit.h
rename to rtc_base/gunit.h
diff --git a/webrtc/rtc_base/gunit_prod.h b/rtc_base/gunit_prod.h
similarity index 100%
rename from webrtc/rtc_base/gunit_prod.h
rename to rtc_base/gunit_prod.h
diff --git a/webrtc/rtc_base/helpers.cc b/rtc_base/helpers.cc
similarity index 100%
rename from webrtc/rtc_base/helpers.cc
rename to rtc_base/helpers.cc
diff --git a/webrtc/rtc_base/helpers.h b/rtc_base/helpers.h
similarity index 100%
rename from webrtc/rtc_base/helpers.h
rename to rtc_base/helpers.h
diff --git a/webrtc/rtc_base/helpers_unittest.cc b/rtc_base/helpers_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/helpers_unittest.cc
rename to rtc_base/helpers_unittest.cc
diff --git a/webrtc/rtc_base/httpbase.cc b/rtc_base/httpbase.cc
similarity index 100%
rename from webrtc/rtc_base/httpbase.cc
rename to rtc_base/httpbase.cc
diff --git a/webrtc/rtc_base/httpbase.h b/rtc_base/httpbase.h
similarity index 100%
rename from webrtc/rtc_base/httpbase.h
rename to rtc_base/httpbase.h
diff --git a/webrtc/rtc_base/httpbase_unittest.cc b/rtc_base/httpbase_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/httpbase_unittest.cc
rename to rtc_base/httpbase_unittest.cc
diff --git a/webrtc/rtc_base/httpcommon-inl.h b/rtc_base/httpcommon-inl.h
similarity index 100%
rename from webrtc/rtc_base/httpcommon-inl.h
rename to rtc_base/httpcommon-inl.h
diff --git a/webrtc/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc
similarity index 100%
rename from webrtc/rtc_base/httpcommon.cc
rename to rtc_base/httpcommon.cc
diff --git a/webrtc/rtc_base/httpcommon.h b/rtc_base/httpcommon.h
similarity index 100%
rename from webrtc/rtc_base/httpcommon.h
rename to rtc_base/httpcommon.h
diff --git a/webrtc/rtc_base/httpcommon_unittest.cc b/rtc_base/httpcommon_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/httpcommon_unittest.cc
rename to rtc_base/httpcommon_unittest.cc
diff --git a/webrtc/rtc_base/httpserver.cc b/rtc_base/httpserver.cc
similarity index 100%
rename from webrtc/rtc_base/httpserver.cc
rename to rtc_base/httpserver.cc
diff --git a/webrtc/rtc_base/httpserver.h b/rtc_base/httpserver.h
similarity index 100%
rename from webrtc/rtc_base/httpserver.h
rename to rtc_base/httpserver.h
diff --git a/webrtc/rtc_base/httpserver_unittest.cc b/rtc_base/httpserver_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/httpserver_unittest.cc
rename to rtc_base/httpserver_unittest.cc
diff --git a/webrtc/rtc_base/ifaddrs-android.cc b/rtc_base/ifaddrs-android.cc
similarity index 100%
rename from webrtc/rtc_base/ifaddrs-android.cc
rename to rtc_base/ifaddrs-android.cc
diff --git a/webrtc/rtc_base/ifaddrs-android.h b/rtc_base/ifaddrs-android.h
similarity index 100%
rename from webrtc/rtc_base/ifaddrs-android.h
rename to rtc_base/ifaddrs-android.h
diff --git a/webrtc/rtc_base/ifaddrs_converter.cc b/rtc_base/ifaddrs_converter.cc
similarity index 100%
rename from webrtc/rtc_base/ifaddrs_converter.cc
rename to rtc_base/ifaddrs_converter.cc
diff --git a/webrtc/rtc_base/ifaddrs_converter.h b/rtc_base/ifaddrs_converter.h
similarity index 100%
rename from webrtc/rtc_base/ifaddrs_converter.h
rename to rtc_base/ifaddrs_converter.h
diff --git a/webrtc/rtc_base/ignore_wundef.h b/rtc_base/ignore_wundef.h
similarity index 100%
rename from webrtc/rtc_base/ignore_wundef.h
rename to rtc_base/ignore_wundef.h
diff --git a/webrtc/rtc_base/ipaddress.cc b/rtc_base/ipaddress.cc
similarity index 100%
rename from webrtc/rtc_base/ipaddress.cc
rename to rtc_base/ipaddress.cc
diff --git a/webrtc/rtc_base/ipaddress.h b/rtc_base/ipaddress.h
similarity index 100%
rename from webrtc/rtc_base/ipaddress.h
rename to rtc_base/ipaddress.h
diff --git a/webrtc/rtc_base/ipaddress_unittest.cc b/rtc_base/ipaddress_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/ipaddress_unittest.cc
rename to rtc_base/ipaddress_unittest.cc
diff --git a/webrtc/rtc_base/java/src/org/webrtc/ContextUtils.java b/rtc_base/java/src/org/webrtc/ContextUtils.java
similarity index 100%
rename from webrtc/rtc_base/java/src/org/webrtc/ContextUtils.java
rename to rtc_base/java/src/org/webrtc/ContextUtils.java
diff --git a/webrtc/rtc_base/java/src/org/webrtc/Logging.java b/rtc_base/java/src/org/webrtc/Logging.java
similarity index 100%
rename from webrtc/rtc_base/java/src/org/webrtc/Logging.java
rename to rtc_base/java/src/org/webrtc/Logging.java
diff --git a/webrtc/rtc_base/java/src/org/webrtc/OWNERS b/rtc_base/java/src/org/webrtc/OWNERS
similarity index 100%
rename from webrtc/rtc_base/java/src/org/webrtc/OWNERS
rename to rtc_base/java/src/org/webrtc/OWNERS
diff --git a/webrtc/rtc_base/java/src/org/webrtc/Size.java b/rtc_base/java/src/org/webrtc/Size.java
similarity index 100%
rename from webrtc/rtc_base/java/src/org/webrtc/Size.java
rename to rtc_base/java/src/org/webrtc/Size.java
diff --git a/webrtc/rtc_base/java/src/org/webrtc/ThreadUtils.java b/rtc_base/java/src/org/webrtc/ThreadUtils.java
similarity index 100%
rename from webrtc/rtc_base/java/src/org/webrtc/ThreadUtils.java
rename to rtc_base/java/src/org/webrtc/ThreadUtils.java
diff --git a/webrtc/rtc_base/json.cc b/rtc_base/json.cc
similarity index 100%
rename from webrtc/rtc_base/json.cc
rename to rtc_base/json.cc
diff --git a/webrtc/rtc_base/json.h b/rtc_base/json.h
similarity index 100%
rename from webrtc/rtc_base/json.h
rename to rtc_base/json.h
diff --git a/webrtc/rtc_base/json_unittest.cc b/rtc_base/json_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/json_unittest.cc
rename to rtc_base/json_unittest.cc
diff --git a/webrtc/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h
similarity index 100%
rename from webrtc/rtc_base/keep_ref_until_done.h
rename to rtc_base/keep_ref_until_done.h
diff --git a/webrtc/rtc_base/location.cc b/rtc_base/location.cc
similarity index 100%
rename from webrtc/rtc_base/location.cc
rename to rtc_base/location.cc
diff --git a/webrtc/rtc_base/location.h b/rtc_base/location.h
similarity index 100%
rename from webrtc/rtc_base/location.h
rename to rtc_base/location.h
diff --git a/webrtc/rtc_base/logging.cc b/rtc_base/logging.cc
similarity index 100%
rename from webrtc/rtc_base/logging.cc
rename to rtc_base/logging.cc
diff --git a/webrtc/rtc_base/logging.h b/rtc_base/logging.h
similarity index 100%
rename from webrtc/rtc_base/logging.h
rename to rtc_base/logging.h
diff --git a/webrtc/rtc_base/logging_mac.mm b/rtc_base/logging_mac.mm
similarity index 100%
rename from webrtc/rtc_base/logging_mac.mm
rename to rtc_base/logging_mac.mm
diff --git a/webrtc/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/logging_unittest.cc
rename to rtc_base/logging_unittest.cc
diff --git a/webrtc/rtc_base/logsinks.cc b/rtc_base/logsinks.cc
similarity index 100%
rename from webrtc/rtc_base/logsinks.cc
rename to rtc_base/logsinks.cc
diff --git a/webrtc/rtc_base/logsinks.h b/rtc_base/logsinks.h
similarity index 100%
rename from webrtc/rtc_base/logsinks.h
rename to rtc_base/logsinks.h
diff --git a/webrtc/rtc_base/macifaddrs_converter.cc b/rtc_base/macifaddrs_converter.cc
similarity index 100%
rename from webrtc/rtc_base/macifaddrs_converter.cc
rename to rtc_base/macifaddrs_converter.cc
diff --git a/webrtc/rtc_base/macutils.cc b/rtc_base/macutils.cc
similarity index 100%
rename from webrtc/rtc_base/macutils.cc
rename to rtc_base/macutils.cc
diff --git a/webrtc/rtc_base/macutils.h b/rtc_base/macutils.h
similarity index 100%
rename from webrtc/rtc_base/macutils.h
rename to rtc_base/macutils.h
diff --git a/webrtc/rtc_base/macutils_unittest.cc b/rtc_base/macutils_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/macutils_unittest.cc
rename to rtc_base/macutils_unittest.cc
diff --git a/webrtc/rtc_base/mathutils.h b/rtc_base/mathutils.h
similarity index 100%
rename from webrtc/rtc_base/mathutils.h
rename to rtc_base/mathutils.h
diff --git a/webrtc/rtc_base/md5.cc b/rtc_base/md5.cc
similarity index 100%
rename from webrtc/rtc_base/md5.cc
rename to rtc_base/md5.cc
diff --git a/webrtc/rtc_base/md5.h b/rtc_base/md5.h
similarity index 100%
rename from webrtc/rtc_base/md5.h
rename to rtc_base/md5.h
diff --git a/webrtc/rtc_base/md5digest.cc b/rtc_base/md5digest.cc
similarity index 100%
rename from webrtc/rtc_base/md5digest.cc
rename to rtc_base/md5digest.cc
diff --git a/webrtc/rtc_base/md5digest.h b/rtc_base/md5digest.h
similarity index 100%
rename from webrtc/rtc_base/md5digest.h
rename to rtc_base/md5digest.h
diff --git a/webrtc/rtc_base/md5digest_unittest.cc b/rtc_base/md5digest_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/md5digest_unittest.cc
rename to rtc_base/md5digest_unittest.cc
diff --git a/webrtc/rtc_base/memory_usage.cc b/rtc_base/memory_usage.cc
similarity index 100%
rename from webrtc/rtc_base/memory_usage.cc
rename to rtc_base/memory_usage.cc
diff --git a/webrtc/rtc_base/memory_usage.h b/rtc_base/memory_usage.h
similarity index 100%
rename from webrtc/rtc_base/memory_usage.h
rename to rtc_base/memory_usage.h
diff --git a/webrtc/rtc_base/memory_usage_unittest.cc b/rtc_base/memory_usage_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/memory_usage_unittest.cc
rename to rtc_base/memory_usage_unittest.cc
diff --git a/webrtc/rtc_base/messagedigest.cc b/rtc_base/messagedigest.cc
similarity index 100%
rename from webrtc/rtc_base/messagedigest.cc
rename to rtc_base/messagedigest.cc
diff --git a/webrtc/rtc_base/messagedigest.h b/rtc_base/messagedigest.h
similarity index 100%
rename from webrtc/rtc_base/messagedigest.h
rename to rtc_base/messagedigest.h
diff --git a/webrtc/rtc_base/messagedigest_unittest.cc b/rtc_base/messagedigest_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/messagedigest_unittest.cc
rename to rtc_base/messagedigest_unittest.cc
diff --git a/webrtc/rtc_base/messagehandler.cc b/rtc_base/messagehandler.cc
similarity index 100%
rename from webrtc/rtc_base/messagehandler.cc
rename to rtc_base/messagehandler.cc
diff --git a/webrtc/rtc_base/messagehandler.h b/rtc_base/messagehandler.h
similarity index 100%
rename from webrtc/rtc_base/messagehandler.h
rename to rtc_base/messagehandler.h
diff --git a/webrtc/rtc_base/messagequeue.cc b/rtc_base/messagequeue.cc
similarity index 100%
rename from webrtc/rtc_base/messagequeue.cc
rename to rtc_base/messagequeue.cc
diff --git a/webrtc/rtc_base/messagequeue.h b/rtc_base/messagequeue.h
similarity index 100%
rename from webrtc/rtc_base/messagequeue.h
rename to rtc_base/messagequeue.h
diff --git a/webrtc/rtc_base/messagequeue_unittest.cc b/rtc_base/messagequeue_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/messagequeue_unittest.cc
rename to rtc_base/messagequeue_unittest.cc
diff --git a/webrtc/rtc_base/mod_ops.h b/rtc_base/mod_ops.h
similarity index 100%
rename from webrtc/rtc_base/mod_ops.h
rename to rtc_base/mod_ops.h
diff --git a/webrtc/rtc_base/mod_ops_unittest.cc b/rtc_base/mod_ops_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/mod_ops_unittest.cc
rename to rtc_base/mod_ops_unittest.cc
diff --git a/webrtc/rtc_base/moving_max_counter.h b/rtc_base/moving_max_counter.h
similarity index 100%
rename from webrtc/rtc_base/moving_max_counter.h
rename to rtc_base/moving_max_counter.h
diff --git a/webrtc/rtc_base/moving_max_counter_unittest.cc b/rtc_base/moving_max_counter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/moving_max_counter_unittest.cc
rename to rtc_base/moving_max_counter_unittest.cc
diff --git a/webrtc/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/nat_unittest.cc
rename to rtc_base/nat_unittest.cc
diff --git a/webrtc/rtc_base/natserver.cc b/rtc_base/natserver.cc
similarity index 100%
rename from webrtc/rtc_base/natserver.cc
rename to rtc_base/natserver.cc
diff --git a/webrtc/rtc_base/natserver.h b/rtc_base/natserver.h
similarity index 100%
rename from webrtc/rtc_base/natserver.h
rename to rtc_base/natserver.h
diff --git a/webrtc/rtc_base/natsocketfactory.cc b/rtc_base/natsocketfactory.cc
similarity index 100%
rename from webrtc/rtc_base/natsocketfactory.cc
rename to rtc_base/natsocketfactory.cc
diff --git a/webrtc/rtc_base/natsocketfactory.h b/rtc_base/natsocketfactory.h
similarity index 100%
rename from webrtc/rtc_base/natsocketfactory.h
rename to rtc_base/natsocketfactory.h
diff --git a/webrtc/rtc_base/nattypes.cc b/rtc_base/nattypes.cc
similarity index 100%
rename from webrtc/rtc_base/nattypes.cc
rename to rtc_base/nattypes.cc
diff --git a/webrtc/rtc_base/nattypes.h b/rtc_base/nattypes.h
similarity index 100%
rename from webrtc/rtc_base/nattypes.h
rename to rtc_base/nattypes.h
diff --git a/webrtc/rtc_base/nethelpers.cc b/rtc_base/nethelpers.cc
similarity index 100%
rename from webrtc/rtc_base/nethelpers.cc
rename to rtc_base/nethelpers.cc
diff --git a/webrtc/rtc_base/nethelpers.h b/rtc_base/nethelpers.h
similarity index 100%
rename from webrtc/rtc_base/nethelpers.h
rename to rtc_base/nethelpers.h
diff --git a/webrtc/rtc_base/network.cc b/rtc_base/network.cc
similarity index 100%
rename from webrtc/rtc_base/network.cc
rename to rtc_base/network.cc
diff --git a/webrtc/rtc_base/network.h b/rtc_base/network.h
similarity index 100%
rename from webrtc/rtc_base/network.h
rename to rtc_base/network.h
diff --git a/webrtc/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/network_unittest.cc
rename to rtc_base/network_unittest.cc
diff --git a/webrtc/rtc_base/networkmonitor.cc b/rtc_base/networkmonitor.cc
similarity index 100%
rename from webrtc/rtc_base/networkmonitor.cc
rename to rtc_base/networkmonitor.cc
diff --git a/webrtc/rtc_base/networkmonitor.h b/rtc_base/networkmonitor.h
similarity index 100%
rename from webrtc/rtc_base/networkmonitor.h
rename to rtc_base/networkmonitor.h
diff --git a/webrtc/rtc_base/networkroute.h b/rtc_base/networkroute.h
similarity index 100%
rename from webrtc/rtc_base/networkroute.h
rename to rtc_base/networkroute.h
diff --git a/webrtc/rtc_base/noop.cc b/rtc_base/noop.cc
similarity index 100%
rename from webrtc/rtc_base/noop.cc
rename to rtc_base/noop.cc
diff --git a/webrtc/rtc_base/noop.mm b/rtc_base/noop.mm
similarity index 100%
rename from webrtc/rtc_base/noop.mm
rename to rtc_base/noop.mm
diff --git a/webrtc/rtc_base/nullsocketserver.cc b/rtc_base/nullsocketserver.cc
similarity index 100%
rename from webrtc/rtc_base/nullsocketserver.cc
rename to rtc_base/nullsocketserver.cc
diff --git a/webrtc/rtc_base/nullsocketserver.h b/rtc_base/nullsocketserver.h
similarity index 100%
rename from webrtc/rtc_base/nullsocketserver.h
rename to rtc_base/nullsocketserver.h
diff --git a/webrtc/rtc_base/nullsocketserver_unittest.cc b/rtc_base/nullsocketserver_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/nullsocketserver_unittest.cc
rename to rtc_base/nullsocketserver_unittest.cc
diff --git a/webrtc/rtc_base/numerics/exp_filter.cc b/rtc_base/numerics/exp_filter.cc
similarity index 100%
rename from webrtc/rtc_base/numerics/exp_filter.cc
rename to rtc_base/numerics/exp_filter.cc
diff --git a/webrtc/rtc_base/numerics/exp_filter.h b/rtc_base/numerics/exp_filter.h
similarity index 100%
rename from webrtc/rtc_base/numerics/exp_filter.h
rename to rtc_base/numerics/exp_filter.h
diff --git a/webrtc/rtc_base/numerics/exp_filter_unittest.cc b/rtc_base/numerics/exp_filter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/numerics/exp_filter_unittest.cc
rename to rtc_base/numerics/exp_filter_unittest.cc
diff --git a/webrtc/rtc_base/numerics/percentile_filter.h b/rtc_base/numerics/percentile_filter.h
similarity index 100%
rename from webrtc/rtc_base/numerics/percentile_filter.h
rename to rtc_base/numerics/percentile_filter.h
diff --git a/webrtc/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/numerics/percentile_filter_unittest.cc
rename to rtc_base/numerics/percentile_filter_unittest.cc
diff --git a/webrtc/rtc_base/onetimeevent.h b/rtc_base/onetimeevent.h
similarity index 100%
rename from webrtc/rtc_base/onetimeevent.h
rename to rtc_base/onetimeevent.h
diff --git a/webrtc/rtc_base/onetimeevent_unittest.cc b/rtc_base/onetimeevent_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/onetimeevent_unittest.cc
rename to rtc_base/onetimeevent_unittest.cc
diff --git a/webrtc/rtc_base/openssl.h b/rtc_base/openssl.h
similarity index 100%
rename from webrtc/rtc_base/openssl.h
rename to rtc_base/openssl.h
diff --git a/webrtc/rtc_base/openssladapter.cc b/rtc_base/openssladapter.cc
similarity index 100%
rename from webrtc/rtc_base/openssladapter.cc
rename to rtc_base/openssladapter.cc
diff --git a/webrtc/rtc_base/openssladapter.h b/rtc_base/openssladapter.h
similarity index 100%
rename from webrtc/rtc_base/openssladapter.h
rename to rtc_base/openssladapter.h
diff --git a/webrtc/rtc_base/openssladapter_unittest.cc b/rtc_base/openssladapter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/openssladapter_unittest.cc
rename to rtc_base/openssladapter_unittest.cc
diff --git a/webrtc/rtc_base/openssldigest.cc b/rtc_base/openssldigest.cc
similarity index 100%
rename from webrtc/rtc_base/openssldigest.cc
rename to rtc_base/openssldigest.cc
diff --git a/webrtc/rtc_base/openssldigest.h b/rtc_base/openssldigest.h
similarity index 100%
rename from webrtc/rtc_base/openssldigest.h
rename to rtc_base/openssldigest.h
diff --git a/webrtc/rtc_base/opensslidentity.cc b/rtc_base/opensslidentity.cc
similarity index 100%
rename from webrtc/rtc_base/opensslidentity.cc
rename to rtc_base/opensslidentity.cc
diff --git a/webrtc/rtc_base/opensslidentity.h b/rtc_base/opensslidentity.h
similarity index 100%
rename from webrtc/rtc_base/opensslidentity.h
rename to rtc_base/opensslidentity.h
diff --git a/webrtc/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc
similarity index 100%
rename from webrtc/rtc_base/opensslstreamadapter.cc
rename to rtc_base/opensslstreamadapter.cc
diff --git a/webrtc/rtc_base/opensslstreamadapter.h b/rtc_base/opensslstreamadapter.h
similarity index 100%
rename from webrtc/rtc_base/opensslstreamadapter.h
rename to rtc_base/opensslstreamadapter.h
diff --git a/webrtc/rtc_base/optional.h b/rtc_base/optional.h
similarity index 100%
rename from webrtc/rtc_base/optional.h
rename to rtc_base/optional.h
diff --git a/webrtc/rtc_base/optionsfile.cc b/rtc_base/optionsfile.cc
similarity index 100%
rename from webrtc/rtc_base/optionsfile.cc
rename to rtc_base/optionsfile.cc
diff --git a/webrtc/rtc_base/optionsfile.h b/rtc_base/optionsfile.h
similarity index 100%
rename from webrtc/rtc_base/optionsfile.h
rename to rtc_base/optionsfile.h
diff --git a/webrtc/rtc_base/optionsfile_unittest.cc b/rtc_base/optionsfile_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/optionsfile_unittest.cc
rename to rtc_base/optionsfile_unittest.cc
diff --git a/webrtc/rtc_base/pathutils.cc b/rtc_base/pathutils.cc
similarity index 100%
rename from webrtc/rtc_base/pathutils.cc
rename to rtc_base/pathutils.cc
diff --git a/webrtc/rtc_base/pathutils.h b/rtc_base/pathutils.h
similarity index 100%
rename from webrtc/rtc_base/pathutils.h
rename to rtc_base/pathutils.h
diff --git a/webrtc/rtc_base/pathutils_unittest.cc b/rtc_base/pathutils_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/pathutils_unittest.cc
rename to rtc_base/pathutils_unittest.cc
diff --git a/webrtc/rtc_base/physicalsocketserver.cc b/rtc_base/physicalsocketserver.cc
similarity index 100%
rename from webrtc/rtc_base/physicalsocketserver.cc
rename to rtc_base/physicalsocketserver.cc
diff --git a/webrtc/rtc_base/physicalsocketserver.h b/rtc_base/physicalsocketserver.h
similarity index 100%
rename from webrtc/rtc_base/physicalsocketserver.h
rename to rtc_base/physicalsocketserver.h
diff --git a/webrtc/rtc_base/physicalsocketserver_unittest.cc b/rtc_base/physicalsocketserver_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/physicalsocketserver_unittest.cc
rename to rtc_base/physicalsocketserver_unittest.cc
diff --git a/webrtc/rtc_base/platform_file.cc b/rtc_base/platform_file.cc
similarity index 100%
rename from webrtc/rtc_base/platform_file.cc
rename to rtc_base/platform_file.cc
diff --git a/webrtc/rtc_base/platform_file.h b/rtc_base/platform_file.h
similarity index 100%
rename from webrtc/rtc_base/platform_file.h
rename to rtc_base/platform_file.h
diff --git a/webrtc/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc
similarity index 100%
rename from webrtc/rtc_base/platform_thread.cc
rename to rtc_base/platform_thread.cc
diff --git a/webrtc/rtc_base/platform_thread.h b/rtc_base/platform_thread.h
similarity index 100%
rename from webrtc/rtc_base/platform_thread.h
rename to rtc_base/platform_thread.h
diff --git a/webrtc/rtc_base/platform_thread_types.h b/rtc_base/platform_thread_types.h
similarity index 100%
rename from webrtc/rtc_base/platform_thread_types.h
rename to rtc_base/platform_thread_types.h
diff --git a/webrtc/rtc_base/platform_thread_unittest.cc b/rtc_base/platform_thread_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/platform_thread_unittest.cc
rename to rtc_base/platform_thread_unittest.cc
diff --git a/webrtc/rtc_base/protobuf_utils.h b/rtc_base/protobuf_utils.h
similarity index 100%
rename from webrtc/rtc_base/protobuf_utils.h
rename to rtc_base/protobuf_utils.h
diff --git a/webrtc/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/proxy_unittest.cc
rename to rtc_base/proxy_unittest.cc
diff --git a/webrtc/rtc_base/proxyinfo.cc b/rtc_base/proxyinfo.cc
similarity index 100%
rename from webrtc/rtc_base/proxyinfo.cc
rename to rtc_base/proxyinfo.cc
diff --git a/webrtc/rtc_base/proxyinfo.h b/rtc_base/proxyinfo.h
similarity index 100%
rename from webrtc/rtc_base/proxyinfo.h
rename to rtc_base/proxyinfo.h
diff --git a/webrtc/rtc_base/proxyserver.cc b/rtc_base/proxyserver.cc
similarity index 100%
rename from webrtc/rtc_base/proxyserver.cc
rename to rtc_base/proxyserver.cc
diff --git a/webrtc/rtc_base/proxyserver.h b/rtc_base/proxyserver.h
similarity index 100%
rename from webrtc/rtc_base/proxyserver.h
rename to rtc_base/proxyserver.h
diff --git a/webrtc/rtc_base/ptr_util.h b/rtc_base/ptr_util.h
similarity index 100%
rename from webrtc/rtc_base/ptr_util.h
rename to rtc_base/ptr_util.h
diff --git a/webrtc/rtc_base/ptr_util_unittest.cc b/rtc_base/ptr_util_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/ptr_util_unittest.cc
rename to rtc_base/ptr_util_unittest.cc
diff --git a/webrtc/rtc_base/race_checker.cc b/rtc_base/race_checker.cc
similarity index 100%
rename from webrtc/rtc_base/race_checker.cc
rename to rtc_base/race_checker.cc
diff --git a/webrtc/rtc_base/race_checker.h b/rtc_base/race_checker.h
similarity index 100%
rename from webrtc/rtc_base/race_checker.h
rename to rtc_base/race_checker.h
diff --git a/webrtc/rtc_base/random.cc b/rtc_base/random.cc
similarity index 100%
rename from webrtc/rtc_base/random.cc
rename to rtc_base/random.cc
diff --git a/webrtc/rtc_base/random.h b/rtc_base/random.h
similarity index 100%
rename from webrtc/rtc_base/random.h
rename to rtc_base/random.h
diff --git a/webrtc/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/random_unittest.cc
rename to rtc_base/random_unittest.cc
diff --git a/webrtc/rtc_base/rate_limiter.cc b/rtc_base/rate_limiter.cc
similarity index 100%
rename from webrtc/rtc_base/rate_limiter.cc
rename to rtc_base/rate_limiter.cc
diff --git a/webrtc/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h
similarity index 100%
rename from webrtc/rtc_base/rate_limiter.h
rename to rtc_base/rate_limiter.h
diff --git a/webrtc/rtc_base/rate_limiter_unittest.cc b/rtc_base/rate_limiter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/rate_limiter_unittest.cc
rename to rtc_base/rate_limiter_unittest.cc
diff --git a/webrtc/rtc_base/rate_statistics.cc b/rtc_base/rate_statistics.cc
similarity index 100%
rename from webrtc/rtc_base/rate_statistics.cc
rename to rtc_base/rate_statistics.cc
diff --git a/webrtc/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h
similarity index 100%
rename from webrtc/rtc_base/rate_statistics.h
rename to rtc_base/rate_statistics.h
diff --git a/webrtc/rtc_base/rate_statistics_unittest.cc b/rtc_base/rate_statistics_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/rate_statistics_unittest.cc
rename to rtc_base/rate_statistics_unittest.cc
diff --git a/webrtc/rtc_base/ratelimiter.cc b/rtc_base/ratelimiter.cc
similarity index 100%
rename from webrtc/rtc_base/ratelimiter.cc
rename to rtc_base/ratelimiter.cc
diff --git a/webrtc/rtc_base/ratelimiter.h b/rtc_base/ratelimiter.h
similarity index 100%
rename from webrtc/rtc_base/ratelimiter.h
rename to rtc_base/ratelimiter.h
diff --git a/webrtc/rtc_base/ratelimiter_unittest.cc b/rtc_base/ratelimiter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/ratelimiter_unittest.cc
rename to rtc_base/ratelimiter_unittest.cc
diff --git a/webrtc/rtc_base/ratetracker.cc b/rtc_base/ratetracker.cc
similarity index 100%
rename from webrtc/rtc_base/ratetracker.cc
rename to rtc_base/ratetracker.cc
diff --git a/webrtc/rtc_base/ratetracker.h b/rtc_base/ratetracker.h
similarity index 100%
rename from webrtc/rtc_base/ratetracker.h
rename to rtc_base/ratetracker.h
diff --git a/webrtc/rtc_base/ratetracker_unittest.cc b/rtc_base/ratetracker_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/ratetracker_unittest.cc
rename to rtc_base/ratetracker_unittest.cc
diff --git a/webrtc/rtc_base/refcount.h b/rtc_base/refcount.h
similarity index 100%
rename from webrtc/rtc_base/refcount.h
rename to rtc_base/refcount.h
diff --git a/webrtc/rtc_base/refcountedobject.h b/rtc_base/refcountedobject.h
similarity index 100%
rename from webrtc/rtc_base/refcountedobject.h
rename to rtc_base/refcountedobject.h
diff --git a/webrtc/rtc_base/refcountedobject_unittest.cc b/rtc_base/refcountedobject_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/refcountedobject_unittest.cc
rename to rtc_base/refcountedobject_unittest.cc
diff --git a/webrtc/rtc_base/rollingaccumulator.h b/rtc_base/rollingaccumulator.h
similarity index 100%
rename from webrtc/rtc_base/rollingaccumulator.h
rename to rtc_base/rollingaccumulator.h
diff --git a/webrtc/rtc_base/rollingaccumulator_unittest.cc b/rtc_base/rollingaccumulator_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/rollingaccumulator_unittest.cc
rename to rtc_base/rollingaccumulator_unittest.cc
diff --git a/webrtc/rtc_base/rtccertificate.cc b/rtc_base/rtccertificate.cc
similarity index 100%
rename from webrtc/rtc_base/rtccertificate.cc
rename to rtc_base/rtccertificate.cc
diff --git a/webrtc/rtc_base/rtccertificate.h b/rtc_base/rtccertificate.h
similarity index 100%
rename from webrtc/rtc_base/rtccertificate.h
rename to rtc_base/rtccertificate.h
diff --git a/webrtc/rtc_base/rtccertificate_unittest.cc b/rtc_base/rtccertificate_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/rtccertificate_unittest.cc
rename to rtc_base/rtccertificate_unittest.cc
diff --git a/webrtc/rtc_base/rtccertificategenerator.cc b/rtc_base/rtccertificategenerator.cc
similarity index 100%
rename from webrtc/rtc_base/rtccertificategenerator.cc
rename to rtc_base/rtccertificategenerator.cc
diff --git a/webrtc/rtc_base/rtccertificategenerator.h b/rtc_base/rtccertificategenerator.h
similarity index 100%
rename from webrtc/rtc_base/rtccertificategenerator.h
rename to rtc_base/rtccertificategenerator.h
diff --git a/webrtc/rtc_base/rtccertificategenerator_unittest.cc b/rtc_base/rtccertificategenerator_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/rtccertificategenerator_unittest.cc
rename to rtc_base/rtccertificategenerator_unittest.cc
diff --git a/webrtc/rtc_base/safe_compare.h b/rtc_base/safe_compare.h
similarity index 100%
rename from webrtc/rtc_base/safe_compare.h
rename to rtc_base/safe_compare.h
diff --git a/webrtc/rtc_base/safe_compare_unittest.cc b/rtc_base/safe_compare_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/safe_compare_unittest.cc
rename to rtc_base/safe_compare_unittest.cc
diff --git a/webrtc/rtc_base/safe_conversions.h b/rtc_base/safe_conversions.h
similarity index 100%
rename from webrtc/rtc_base/safe_conversions.h
rename to rtc_base/safe_conversions.h
diff --git a/webrtc/rtc_base/safe_conversions_impl.h b/rtc_base/safe_conversions_impl.h
similarity index 100%
rename from webrtc/rtc_base/safe_conversions_impl.h
rename to rtc_base/safe_conversions_impl.h
diff --git a/webrtc/rtc_base/safe_minmax.h b/rtc_base/safe_minmax.h
similarity index 100%
rename from webrtc/rtc_base/safe_minmax.h
rename to rtc_base/safe_minmax.h
diff --git a/webrtc/rtc_base/safe_minmax_unittest.cc b/rtc_base/safe_minmax_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/safe_minmax_unittest.cc
rename to rtc_base/safe_minmax_unittest.cc
diff --git a/webrtc/rtc_base/sanitizer.h b/rtc_base/sanitizer.h
similarity index 100%
rename from webrtc/rtc_base/sanitizer.h
rename to rtc_base/sanitizer.h
diff --git a/webrtc/rtc_base/scoped_ref_ptr.h b/rtc_base/scoped_ref_ptr.h
similarity index 100%
rename from webrtc/rtc_base/scoped_ref_ptr.h
rename to rtc_base/scoped_ref_ptr.h
diff --git a/webrtc/rtc_base/sequenced_task_checker.h b/rtc_base/sequenced_task_checker.h
similarity index 100%
rename from webrtc/rtc_base/sequenced_task_checker.h
rename to rtc_base/sequenced_task_checker.h
diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.cc b/rtc_base/sequenced_task_checker_impl.cc
similarity index 100%
rename from webrtc/rtc_base/sequenced_task_checker_impl.cc
rename to rtc_base/sequenced_task_checker_impl.cc
diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h
similarity index 100%
rename from webrtc/rtc_base/sequenced_task_checker_impl.h
rename to rtc_base/sequenced_task_checker_impl.h
diff --git a/webrtc/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sequenced_task_checker_unittest.cc
rename to rtc_base/sequenced_task_checker_unittest.cc
diff --git a/webrtc/rtc_base/sha1.cc b/rtc_base/sha1.cc
similarity index 100%
rename from webrtc/rtc_base/sha1.cc
rename to rtc_base/sha1.cc
diff --git a/webrtc/rtc_base/sha1.h b/rtc_base/sha1.h
similarity index 100%
rename from webrtc/rtc_base/sha1.h
rename to rtc_base/sha1.h
diff --git a/webrtc/rtc_base/sha1digest.cc b/rtc_base/sha1digest.cc
similarity index 100%
rename from webrtc/rtc_base/sha1digest.cc
rename to rtc_base/sha1digest.cc
diff --git a/webrtc/rtc_base/sha1digest.h b/rtc_base/sha1digest.h
similarity index 100%
rename from webrtc/rtc_base/sha1digest.h
rename to rtc_base/sha1digest.h
diff --git a/webrtc/rtc_base/sha1digest_unittest.cc b/rtc_base/sha1digest_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sha1digest_unittest.cc
rename to rtc_base/sha1digest_unittest.cc
diff --git a/webrtc/rtc_base/signalthread.cc b/rtc_base/signalthread.cc
similarity index 100%
rename from webrtc/rtc_base/signalthread.cc
rename to rtc_base/signalthread.cc
diff --git a/webrtc/rtc_base/signalthread.h b/rtc_base/signalthread.h
similarity index 100%
rename from webrtc/rtc_base/signalthread.h
rename to rtc_base/signalthread.h
diff --git a/webrtc/rtc_base/signalthread_unittest.cc b/rtc_base/signalthread_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/signalthread_unittest.cc
rename to rtc_base/signalthread_unittest.cc
diff --git a/webrtc/rtc_base/sigslot.cc b/rtc_base/sigslot.cc
similarity index 100%
rename from webrtc/rtc_base/sigslot.cc
rename to rtc_base/sigslot.cc
diff --git a/webrtc/rtc_base/sigslot.h b/rtc_base/sigslot.h
similarity index 100%
rename from webrtc/rtc_base/sigslot.h
rename to rtc_base/sigslot.h
diff --git a/webrtc/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sigslot_unittest.cc
rename to rtc_base/sigslot_unittest.cc
diff --git a/webrtc/rtc_base/sigslottester.h b/rtc_base/sigslottester.h
similarity index 100%
rename from webrtc/rtc_base/sigslottester.h
rename to rtc_base/sigslottester.h
diff --git a/webrtc/rtc_base/sigslottester.h.pump b/rtc_base/sigslottester.h.pump
similarity index 100%
rename from webrtc/rtc_base/sigslottester.h.pump
rename to rtc_base/sigslottester.h.pump
diff --git a/webrtc/rtc_base/sigslottester_unittest.cc b/rtc_base/sigslottester_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sigslottester_unittest.cc
rename to rtc_base/sigslottester_unittest.cc
diff --git a/webrtc/rtc_base/socket.h b/rtc_base/socket.h
similarity index 100%
rename from webrtc/rtc_base/socket.h
rename to rtc_base/socket.h
diff --git a/webrtc/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/socket_unittest.cc
rename to rtc_base/socket_unittest.cc
diff --git a/webrtc/rtc_base/socket_unittest.h b/rtc_base/socket_unittest.h
similarity index 100%
rename from webrtc/rtc_base/socket_unittest.h
rename to rtc_base/socket_unittest.h
diff --git a/webrtc/rtc_base/socketadapters.cc b/rtc_base/socketadapters.cc
similarity index 100%
rename from webrtc/rtc_base/socketadapters.cc
rename to rtc_base/socketadapters.cc
diff --git a/webrtc/rtc_base/socketadapters.h b/rtc_base/socketadapters.h
similarity index 100%
rename from webrtc/rtc_base/socketadapters.h
rename to rtc_base/socketadapters.h
diff --git a/webrtc/rtc_base/socketaddress.cc b/rtc_base/socketaddress.cc
similarity index 100%
rename from webrtc/rtc_base/socketaddress.cc
rename to rtc_base/socketaddress.cc
diff --git a/webrtc/rtc_base/socketaddress.h b/rtc_base/socketaddress.h
similarity index 100%
rename from webrtc/rtc_base/socketaddress.h
rename to rtc_base/socketaddress.h
diff --git a/webrtc/rtc_base/socketaddress_unittest.cc b/rtc_base/socketaddress_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/socketaddress_unittest.cc
rename to rtc_base/socketaddress_unittest.cc
diff --git a/webrtc/rtc_base/socketaddresspair.cc b/rtc_base/socketaddresspair.cc
similarity index 100%
rename from webrtc/rtc_base/socketaddresspair.cc
rename to rtc_base/socketaddresspair.cc
diff --git a/webrtc/rtc_base/socketaddresspair.h b/rtc_base/socketaddresspair.h
similarity index 100%
rename from webrtc/rtc_base/socketaddresspair.h
rename to rtc_base/socketaddresspair.h
diff --git a/webrtc/rtc_base/socketfactory.h b/rtc_base/socketfactory.h
similarity index 100%
rename from webrtc/rtc_base/socketfactory.h
rename to rtc_base/socketfactory.h
diff --git a/webrtc/rtc_base/socketserver.h b/rtc_base/socketserver.h
similarity index 100%
rename from webrtc/rtc_base/socketserver.h
rename to rtc_base/socketserver.h
diff --git a/webrtc/rtc_base/socketstream.cc b/rtc_base/socketstream.cc
similarity index 100%
rename from webrtc/rtc_base/socketstream.cc
rename to rtc_base/socketstream.cc
diff --git a/webrtc/rtc_base/socketstream.h b/rtc_base/socketstream.h
similarity index 100%
rename from webrtc/rtc_base/socketstream.h
rename to rtc_base/socketstream.h
diff --git a/webrtc/rtc_base/ssladapter.cc b/rtc_base/ssladapter.cc
similarity index 100%
rename from webrtc/rtc_base/ssladapter.cc
rename to rtc_base/ssladapter.cc
diff --git a/webrtc/rtc_base/ssladapter.h b/rtc_base/ssladapter.h
similarity index 100%
rename from webrtc/rtc_base/ssladapter.h
rename to rtc_base/ssladapter.h
diff --git a/webrtc/rtc_base/ssladapter_unittest.cc b/rtc_base/ssladapter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/ssladapter_unittest.cc
rename to rtc_base/ssladapter_unittest.cc
diff --git a/webrtc/rtc_base/sslfingerprint.cc b/rtc_base/sslfingerprint.cc
similarity index 100%
rename from webrtc/rtc_base/sslfingerprint.cc
rename to rtc_base/sslfingerprint.cc
diff --git a/webrtc/rtc_base/sslfingerprint.h b/rtc_base/sslfingerprint.h
similarity index 100%
rename from webrtc/rtc_base/sslfingerprint.h
rename to rtc_base/sslfingerprint.h
diff --git a/webrtc/rtc_base/sslidentity.cc b/rtc_base/sslidentity.cc
similarity index 100%
rename from webrtc/rtc_base/sslidentity.cc
rename to rtc_base/sslidentity.cc
diff --git a/webrtc/rtc_base/sslidentity.h b/rtc_base/sslidentity.h
similarity index 100%
rename from webrtc/rtc_base/sslidentity.h
rename to rtc_base/sslidentity.h
diff --git a/webrtc/rtc_base/sslidentity_unittest.cc b/rtc_base/sslidentity_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sslidentity_unittest.cc
rename to rtc_base/sslidentity_unittest.cc
diff --git a/webrtc/rtc_base/sslroots.h b/rtc_base/sslroots.h
similarity index 100%
rename from webrtc/rtc_base/sslroots.h
rename to rtc_base/sslroots.h
diff --git a/webrtc/rtc_base/sslstreamadapter.cc b/rtc_base/sslstreamadapter.cc
similarity index 100%
rename from webrtc/rtc_base/sslstreamadapter.cc
rename to rtc_base/sslstreamadapter.cc
diff --git a/webrtc/rtc_base/sslstreamadapter.h b/rtc_base/sslstreamadapter.h
similarity index 100%
rename from webrtc/rtc_base/sslstreamadapter.h
rename to rtc_base/sslstreamadapter.h
diff --git a/webrtc/rtc_base/sslstreamadapter_unittest.cc b/rtc_base/sslstreamadapter_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/sslstreamadapter_unittest.cc
rename to rtc_base/sslstreamadapter_unittest.cc
diff --git a/webrtc/rtc_base/stream.cc b/rtc_base/stream.cc
similarity index 100%
rename from webrtc/rtc_base/stream.cc
rename to rtc_base/stream.cc
diff --git a/webrtc/rtc_base/stream.h b/rtc_base/stream.h
similarity index 100%
rename from webrtc/rtc_base/stream.h
rename to rtc_base/stream.h
diff --git a/webrtc/rtc_base/stream_unittest.cc b/rtc_base/stream_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/stream_unittest.cc
rename to rtc_base/stream_unittest.cc
diff --git a/webrtc/rtc_base/string_to_number.cc b/rtc_base/string_to_number.cc
similarity index 100%
rename from webrtc/rtc_base/string_to_number.cc
rename to rtc_base/string_to_number.cc
diff --git a/webrtc/rtc_base/string_to_number.h b/rtc_base/string_to_number.h
similarity index 100%
rename from webrtc/rtc_base/string_to_number.h
rename to rtc_base/string_to_number.h
diff --git a/webrtc/rtc_base/string_to_number_unittest.cc b/rtc_base/string_to_number_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/string_to_number_unittest.cc
rename to rtc_base/string_to_number_unittest.cc
diff --git a/webrtc/rtc_base/stringencode.cc b/rtc_base/stringencode.cc
similarity index 100%
rename from webrtc/rtc_base/stringencode.cc
rename to rtc_base/stringencode.cc
diff --git a/webrtc/rtc_base/stringencode.h b/rtc_base/stringencode.h
similarity index 100%
rename from webrtc/rtc_base/stringencode.h
rename to rtc_base/stringencode.h
diff --git a/webrtc/rtc_base/stringencode_unittest.cc b/rtc_base/stringencode_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/stringencode_unittest.cc
rename to rtc_base/stringencode_unittest.cc
diff --git a/webrtc/rtc_base/stringize_macros.h b/rtc_base/stringize_macros.h
similarity index 100%
rename from webrtc/rtc_base/stringize_macros.h
rename to rtc_base/stringize_macros.h
diff --git a/webrtc/rtc_base/stringize_macros_unittest.cc b/rtc_base/stringize_macros_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/stringize_macros_unittest.cc
rename to rtc_base/stringize_macros_unittest.cc
diff --git a/webrtc/rtc_base/stringutils.cc b/rtc_base/stringutils.cc
similarity index 100%
rename from webrtc/rtc_base/stringutils.cc
rename to rtc_base/stringutils.cc
diff --git a/webrtc/rtc_base/stringutils.h b/rtc_base/stringutils.h
similarity index 100%
rename from webrtc/rtc_base/stringutils.h
rename to rtc_base/stringutils.h
diff --git a/webrtc/rtc_base/stringutils_unittest.cc b/rtc_base/stringutils_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/stringutils_unittest.cc
rename to rtc_base/stringutils_unittest.cc
diff --git a/webrtc/rtc_base/swap_queue.h b/rtc_base/swap_queue.h
similarity index 100%
rename from webrtc/rtc_base/swap_queue.h
rename to rtc_base/swap_queue.h
diff --git a/webrtc/rtc_base/swap_queue_unittest.cc b/rtc_base/swap_queue_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/swap_queue_unittest.cc
rename to rtc_base/swap_queue_unittest.cc
diff --git a/webrtc/rtc_base/task_queue.h b/rtc_base/task_queue.h
similarity index 100%
rename from webrtc/rtc_base/task_queue.h
rename to rtc_base/task_queue.h
diff --git a/webrtc/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc
similarity index 100%
rename from webrtc/rtc_base/task_queue_gcd.cc
rename to rtc_base/task_queue_gcd.cc
diff --git a/webrtc/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc
similarity index 100%
rename from webrtc/rtc_base/task_queue_libevent.cc
rename to rtc_base/task_queue_libevent.cc
diff --git a/webrtc/rtc_base/task_queue_posix.cc b/rtc_base/task_queue_posix.cc
similarity index 100%
rename from webrtc/rtc_base/task_queue_posix.cc
rename to rtc_base/task_queue_posix.cc
diff --git a/webrtc/rtc_base/task_queue_posix.h b/rtc_base/task_queue_posix.h
similarity index 100%
rename from webrtc/rtc_base/task_queue_posix.h
rename to rtc_base/task_queue_posix.h
diff --git a/webrtc/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/task_queue_unittest.cc
rename to rtc_base/task_queue_unittest.cc
diff --git a/webrtc/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc
similarity index 100%
rename from webrtc/rtc_base/task_queue_win.cc
rename to rtc_base/task_queue_win.cc
diff --git a/webrtc/rtc_base/template_util.h b/rtc_base/template_util.h
similarity index 100%
rename from webrtc/rtc_base/template_util.h
rename to rtc_base/template_util.h
diff --git a/webrtc/rtc_base/testbase64.h b/rtc_base/testbase64.h
similarity index 100%
rename from webrtc/rtc_base/testbase64.h
rename to rtc_base/testbase64.h
diff --git a/webrtc/rtc_base/testclient.cc b/rtc_base/testclient.cc
similarity index 100%
rename from webrtc/rtc_base/testclient.cc
rename to rtc_base/testclient.cc
diff --git a/webrtc/rtc_base/testclient.h b/rtc_base/testclient.h
similarity index 100%
rename from webrtc/rtc_base/testclient.h
rename to rtc_base/testclient.h
diff --git a/webrtc/rtc_base/testclient_unittest.cc b/rtc_base/testclient_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/testclient_unittest.cc
rename to rtc_base/testclient_unittest.cc
diff --git a/webrtc/rtc_base/testechoserver.h b/rtc_base/testechoserver.h
similarity index 100%
rename from webrtc/rtc_base/testechoserver.h
rename to rtc_base/testechoserver.h
diff --git a/webrtc/rtc_base/testutils.h b/rtc_base/testutils.h
similarity index 100%
rename from webrtc/rtc_base/testutils.h
rename to rtc_base/testutils.h
diff --git a/webrtc/rtc_base/thread.cc b/rtc_base/thread.cc
similarity index 100%
rename from webrtc/rtc_base/thread.cc
rename to rtc_base/thread.cc
diff --git a/webrtc/rtc_base/thread.h b/rtc_base/thread.h
similarity index 100%
rename from webrtc/rtc_base/thread.h
rename to rtc_base/thread.h
diff --git a/webrtc/rtc_base/thread_annotations.h b/rtc_base/thread_annotations.h
similarity index 100%
rename from webrtc/rtc_base/thread_annotations.h
rename to rtc_base/thread_annotations.h
diff --git a/webrtc/rtc_base/thread_annotations_unittest.cc b/rtc_base/thread_annotations_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/thread_annotations_unittest.cc
rename to rtc_base/thread_annotations_unittest.cc
diff --git a/webrtc/rtc_base/thread_checker.h b/rtc_base/thread_checker.h
similarity index 100%
rename from webrtc/rtc_base/thread_checker.h
rename to rtc_base/thread_checker.h
diff --git a/webrtc/rtc_base/thread_checker_impl.cc b/rtc_base/thread_checker_impl.cc
similarity index 100%
rename from webrtc/rtc_base/thread_checker_impl.cc
rename to rtc_base/thread_checker_impl.cc
diff --git a/webrtc/rtc_base/thread_checker_impl.h b/rtc_base/thread_checker_impl.h
similarity index 100%
rename from webrtc/rtc_base/thread_checker_impl.h
rename to rtc_base/thread_checker_impl.h
diff --git a/webrtc/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/thread_checker_unittest.cc
rename to rtc_base/thread_checker_unittest.cc
diff --git a/webrtc/rtc_base/thread_darwin.mm b/rtc_base/thread_darwin.mm
similarity index 100%
rename from webrtc/rtc_base/thread_darwin.mm
rename to rtc_base/thread_darwin.mm
diff --git a/webrtc/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/thread_unittest.cc
rename to rtc_base/thread_unittest.cc
diff --git a/webrtc/rtc_base/timedelta.h b/rtc_base/timedelta.h
similarity index 100%
rename from webrtc/rtc_base/timedelta.h
rename to rtc_base/timedelta.h
diff --git a/webrtc/rtc_base/timestampaligner.cc b/rtc_base/timestampaligner.cc
similarity index 100%
rename from webrtc/rtc_base/timestampaligner.cc
rename to rtc_base/timestampaligner.cc
diff --git a/webrtc/rtc_base/timestampaligner.h b/rtc_base/timestampaligner.h
similarity index 100%
rename from webrtc/rtc_base/timestampaligner.h
rename to rtc_base/timestampaligner.h
diff --git a/webrtc/rtc_base/timestampaligner_unittest.cc b/rtc_base/timestampaligner_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/timestampaligner_unittest.cc
rename to rtc_base/timestampaligner_unittest.cc
diff --git a/webrtc/rtc_base/timeutils.cc b/rtc_base/timeutils.cc
similarity index 100%
rename from webrtc/rtc_base/timeutils.cc
rename to rtc_base/timeutils.cc
diff --git a/webrtc/rtc_base/timeutils.h b/rtc_base/timeutils.h
similarity index 100%
rename from webrtc/rtc_base/timeutils.h
rename to rtc_base/timeutils.h
diff --git a/webrtc/rtc_base/timeutils_unittest.cc b/rtc_base/timeutils_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/timeutils_unittest.cc
rename to rtc_base/timeutils_unittest.cc
diff --git a/webrtc/rtc_base/trace_event.h b/rtc_base/trace_event.h
similarity index 100%
rename from webrtc/rtc_base/trace_event.h
rename to rtc_base/trace_event.h
diff --git a/webrtc/rtc_base/transformadapter.cc b/rtc_base/transformadapter.cc
similarity index 100%
rename from webrtc/rtc_base/transformadapter.cc
rename to rtc_base/transformadapter.cc
diff --git a/webrtc/rtc_base/transformadapter.h b/rtc_base/transformadapter.h
similarity index 100%
rename from webrtc/rtc_base/transformadapter.h
rename to rtc_base/transformadapter.h
diff --git a/webrtc/rtc_base/type_traits.h b/rtc_base/type_traits.h
similarity index 100%
rename from webrtc/rtc_base/type_traits.h
rename to rtc_base/type_traits.h
diff --git a/webrtc/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
similarity index 100%
rename from webrtc/rtc_base/unittest_main.cc
rename to rtc_base/unittest_main.cc
diff --git a/webrtc/rtc_base/unixfilesystem.cc b/rtc_base/unixfilesystem.cc
similarity index 100%
rename from webrtc/rtc_base/unixfilesystem.cc
rename to rtc_base/unixfilesystem.cc
diff --git a/webrtc/rtc_base/unixfilesystem.h b/rtc_base/unixfilesystem.h
similarity index 100%
rename from webrtc/rtc_base/unixfilesystem.h
rename to rtc_base/unixfilesystem.h
diff --git a/webrtc/rtc_base/virtualsocket_unittest.cc b/rtc_base/virtualsocket_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/virtualsocket_unittest.cc
rename to rtc_base/virtualsocket_unittest.cc
diff --git a/webrtc/rtc_base/virtualsocketserver.cc b/rtc_base/virtualsocketserver.cc
similarity index 100%
rename from webrtc/rtc_base/virtualsocketserver.cc
rename to rtc_base/virtualsocketserver.cc
diff --git a/webrtc/rtc_base/virtualsocketserver.h b/rtc_base/virtualsocketserver.h
similarity index 100%
rename from webrtc/rtc_base/virtualsocketserver.h
rename to rtc_base/virtualsocketserver.h
diff --git a/webrtc/rtc_base/weak_ptr.cc b/rtc_base/weak_ptr.cc
similarity index 100%
rename from webrtc/rtc_base/weak_ptr.cc
rename to rtc_base/weak_ptr.cc
diff --git a/webrtc/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h
similarity index 100%
rename from webrtc/rtc_base/weak_ptr.h
rename to rtc_base/weak_ptr.h
diff --git a/webrtc/rtc_base/weak_ptr_unittest.cc b/rtc_base/weak_ptr_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/weak_ptr_unittest.cc
rename to rtc_base/weak_ptr_unittest.cc
diff --git a/webrtc/rtc_base/win32.cc b/rtc_base/win32.cc
similarity index 100%
rename from webrtc/rtc_base/win32.cc
rename to rtc_base/win32.cc
diff --git a/webrtc/rtc_base/win32.h b/rtc_base/win32.h
similarity index 100%
rename from webrtc/rtc_base/win32.h
rename to rtc_base/win32.h
diff --git a/webrtc/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/win32_unittest.cc
rename to rtc_base/win32_unittest.cc
diff --git a/webrtc/rtc_base/win32filesystem.cc b/rtc_base/win32filesystem.cc
similarity index 100%
rename from webrtc/rtc_base/win32filesystem.cc
rename to rtc_base/win32filesystem.cc
diff --git a/webrtc/rtc_base/win32filesystem.h b/rtc_base/win32filesystem.h
similarity index 100%
rename from webrtc/rtc_base/win32filesystem.h
rename to rtc_base/win32filesystem.h
diff --git a/webrtc/rtc_base/win32securityerrors.cc b/rtc_base/win32securityerrors.cc
similarity index 100%
rename from webrtc/rtc_base/win32securityerrors.cc
rename to rtc_base/win32securityerrors.cc
diff --git a/webrtc/rtc_base/win32socketinit.cc b/rtc_base/win32socketinit.cc
similarity index 100%
rename from webrtc/rtc_base/win32socketinit.cc
rename to rtc_base/win32socketinit.cc
diff --git a/webrtc/rtc_base/win32socketinit.h b/rtc_base/win32socketinit.h
similarity index 100%
rename from webrtc/rtc_base/win32socketinit.h
rename to rtc_base/win32socketinit.h
diff --git a/webrtc/rtc_base/win32socketserver.cc b/rtc_base/win32socketserver.cc
similarity index 100%
rename from webrtc/rtc_base/win32socketserver.cc
rename to rtc_base/win32socketserver.cc
diff --git a/webrtc/rtc_base/win32socketserver.h b/rtc_base/win32socketserver.h
similarity index 100%
rename from webrtc/rtc_base/win32socketserver.h
rename to rtc_base/win32socketserver.h
diff --git a/webrtc/rtc_base/win32socketserver_unittest.cc b/rtc_base/win32socketserver_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/win32socketserver_unittest.cc
rename to rtc_base/win32socketserver_unittest.cc
diff --git a/webrtc/rtc_base/win32window.cc b/rtc_base/win32window.cc
similarity index 100%
rename from webrtc/rtc_base/win32window.cc
rename to rtc_base/win32window.cc
diff --git a/webrtc/rtc_base/win32window.h b/rtc_base/win32window.h
similarity index 100%
rename from webrtc/rtc_base/win32window.h
rename to rtc_base/win32window.h
diff --git a/webrtc/rtc_base/win32window_unittest.cc b/rtc_base/win32window_unittest.cc
similarity index 100%
rename from webrtc/rtc_base/win32window_unittest.cc
rename to rtc_base/win32window_unittest.cc
diff --git a/webrtc/rtc_base/window.h b/rtc_base/window.h
similarity index 100%
rename from webrtc/rtc_base/window.h
rename to rtc_base/window.h
diff --git a/webrtc/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
similarity index 100%
rename from webrtc/rtc_tools/BUILD.gn
rename to rtc_tools/BUILD.gn
diff --git a/webrtc/rtc_tools/DEPS b/rtc_tools/DEPS
similarity index 100%
rename from webrtc/rtc_tools/DEPS
rename to rtc_tools/DEPS
diff --git a/webrtc/rtc_tools/OWNERS b/rtc_tools/OWNERS
similarity index 100%
rename from webrtc/rtc_tools/OWNERS
rename to rtc_tools/OWNERS
diff --git a/webrtc/rtc_tools/agc/activity_metric.cc b/rtc_tools/agc/activity_metric.cc
similarity index 100%
rename from webrtc/rtc_tools/agc/activity_metric.cc
rename to rtc_tools/agc/activity_metric.cc
diff --git a/webrtc/rtc_tools/author_line_count.sh b/rtc_tools/author_line_count.sh
similarity index 100%
rename from webrtc/rtc_tools/author_line_count.sh
rename to rtc_tools/author_line_count.sh
diff --git a/webrtc/rtc_tools/barcode_tools/DEPS b/rtc_tools/barcode_tools/DEPS
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/DEPS
rename to rtc_tools/barcode_tools/DEPS
diff --git a/webrtc/rtc_tools/barcode_tools/README b/rtc_tools/barcode_tools/README
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/README
rename to rtc_tools/barcode_tools/README
diff --git a/webrtc/rtc_tools/barcode_tools/barcode_decoder.py b/rtc_tools/barcode_tools/barcode_decoder.py
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/barcode_decoder.py
rename to rtc_tools/barcode_tools/barcode_decoder.py
diff --git a/webrtc/rtc_tools/barcode_tools/barcode_encoder.py b/rtc_tools/barcode_tools/barcode_encoder.py
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/barcode_encoder.py
rename to rtc_tools/barcode_tools/barcode_encoder.py
diff --git a/webrtc/rtc_tools/barcode_tools/build_zxing.py b/rtc_tools/barcode_tools/build_zxing.py
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/build_zxing.py
rename to rtc_tools/barcode_tools/build_zxing.py
diff --git a/webrtc/rtc_tools/barcode_tools/helper_functions.py b/rtc_tools/barcode_tools/helper_functions.py
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/helper_functions.py
rename to rtc_tools/barcode_tools/helper_functions.py
diff --git a/webrtc/rtc_tools/barcode_tools/yuv_cropper.py b/rtc_tools/barcode_tools/yuv_cropper.py
similarity index 100%
rename from webrtc/rtc_tools/barcode_tools/yuv_cropper.py
rename to rtc_tools/barcode_tools/yuv_cropper.py
diff --git a/webrtc/rtc_tools/class_usage.sh b/rtc_tools/class_usage.sh
similarity index 100%
rename from webrtc/rtc_tools/class_usage.sh
rename to rtc_tools/class_usage.sh
diff --git a/webrtc/rtc_tools/compare_videos.py b/rtc_tools/compare_videos.py
similarity index 100%
rename from webrtc/rtc_tools/compare_videos.py
rename to rtc_tools/compare_videos.py
diff --git a/webrtc/rtc_tools/converter/converter.cc b/rtc_tools/converter/converter.cc
similarity index 100%
rename from webrtc/rtc_tools/converter/converter.cc
rename to rtc_tools/converter/converter.cc
diff --git a/webrtc/rtc_tools/converter/converter.h b/rtc_tools/converter/converter.h
similarity index 100%
rename from webrtc/rtc_tools/converter/converter.h
rename to rtc_tools/converter/converter.h
diff --git a/webrtc/rtc_tools/converter/rgba_to_i420_converter.cc b/rtc_tools/converter/rgba_to_i420_converter.cc
similarity index 100%
rename from webrtc/rtc_tools/converter/rgba_to_i420_converter.cc
rename to rtc_tools/converter/rgba_to_i420_converter.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/OWNERS b/rtc_tools/event_log_visualizer/OWNERS
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/OWNERS
rename to rtc_tools/event_log_visualizer/OWNERS
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/analyzer.cc
rename to rtc_tools/event_log_visualizer/analyzer.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.h b/rtc_tools/event_log_visualizer/analyzer.h
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/analyzer.h
rename to rtc_tools/event_log_visualizer/analyzer.h
diff --git a/webrtc/rtc_tools/event_log_visualizer/chart.proto b/rtc_tools/event_log_visualizer/chart.proto
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/chart.proto
rename to rtc_tools/event_log_visualizer/chart.proto
diff --git a/webrtc/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/event_log_visualizer/main.cc
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/main.cc
rename to rtc_tools/event_log_visualizer/main.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc b/rtc_tools/event_log_visualizer/plot_base.cc
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_base.cc
rename to rtc_tools/event_log_visualizer/plot_base.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.h b/rtc_tools/event_log_visualizer/plot_base.h
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_base.h
rename to rtc_tools/event_log_visualizer/plot_base.h
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.cc b/rtc_tools/event_log_visualizer/plot_protobuf.cc
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_protobuf.cc
rename to rtc_tools/event_log_visualizer/plot_protobuf.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h b/rtc_tools/event_log_visualizer/plot_protobuf.h
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
rename to rtc_tools/event_log_visualizer/plot_protobuf.h
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_python.cc b/rtc_tools/event_log_visualizer/plot_python.cc
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_python.cc
rename to rtc_tools/event_log_visualizer/plot_python.cc
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_python.h b/rtc_tools/event_log_visualizer/plot_python.h
similarity index 100%
rename from webrtc/rtc_tools/event_log_visualizer/plot_python.h
rename to rtc_tools/event_log_visualizer/plot_python.h
diff --git a/webrtc/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
similarity index 100%
rename from webrtc/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
rename to rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/frame_analyzer.cc b/rtc_tools/frame_analyzer/frame_analyzer.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/frame_analyzer.cc
rename to rtc_tools/frame_analyzer/frame_analyzer.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis.cc
rename to rtc_tools/frame_analyzer/reference_less_video_analysis.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc
rename to rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h
rename to rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h
diff --git a/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
rename to rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.cc b/rtc_tools/frame_analyzer/video_quality_analysis.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/video_quality_analysis.cc
rename to rtc_tools/frame_analyzer/video_quality_analysis.cc
diff --git a/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h b/rtc_tools/frame_analyzer/video_quality_analysis.h
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h
rename to rtc_tools/frame_analyzer/video_quality_analysis.h
diff --git a/webrtc/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
rename to rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
diff --git a/webrtc/rtc_tools/frame_editing/frame_editing.cc b/rtc_tools/frame_editing/frame_editing.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_editing/frame_editing.cc
rename to rtc_tools/frame_editing/frame_editing.cc
diff --git a/webrtc/rtc_tools/frame_editing/frame_editing_lib.cc b/rtc_tools/frame_editing/frame_editing_lib.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_editing/frame_editing_lib.cc
rename to rtc_tools/frame_editing/frame_editing_lib.cc
diff --git a/webrtc/rtc_tools/frame_editing/frame_editing_lib.h b/rtc_tools/frame_editing/frame_editing_lib.h
similarity index 100%
rename from webrtc/rtc_tools/frame_editing/frame_editing_lib.h
rename to rtc_tools/frame_editing/frame_editing_lib.h
diff --git a/webrtc/rtc_tools/frame_editing/frame_editing_unittest.cc b/rtc_tools/frame_editing/frame_editing_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/frame_editing/frame_editing_unittest.cc
rename to rtc_tools/frame_editing/frame_editing_unittest.cc
diff --git a/webrtc/rtc_tools/header_usage.sh b/rtc_tools/header_usage.sh
similarity index 100%
rename from webrtc/rtc_tools/header_usage.sh
rename to rtc_tools/header_usage.sh
diff --git a/webrtc/rtc_tools/loopback_test/OWNERS b/rtc_tools/loopback_test/OWNERS
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/OWNERS
rename to rtc_tools/loopback_test/OWNERS
diff --git a/webrtc/rtc_tools/loopback_test/README b/rtc_tools/loopback_test/README
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/README
rename to rtc_tools/loopback_test/README
diff --git a/webrtc/rtc_tools/loopback_test/adapter.js b/rtc_tools/loopback_test/adapter.js
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/adapter.js
rename to rtc_tools/loopback_test/adapter.js
diff --git a/webrtc/rtc_tools/loopback_test/loopback_test.html b/rtc_tools/loopback_test/loopback_test.html
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/loopback_test.html
rename to rtc_tools/loopback_test/loopback_test.html
diff --git a/webrtc/rtc_tools/loopback_test/loopback_test.js b/rtc_tools/loopback_test/loopback_test.js
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/loopback_test.js
rename to rtc_tools/loopback_test/loopback_test.js
diff --git a/webrtc/rtc_tools/loopback_test/record-test.sh b/rtc_tools/loopback_test/record-test.sh
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/record-test.sh
rename to rtc_tools/loopback_test/record-test.sh
diff --git a/webrtc/rtc_tools/loopback_test/run-server.sh b/rtc_tools/loopback_test/run-server.sh
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/run-server.sh
rename to rtc_tools/loopback_test/run-server.sh
diff --git a/webrtc/rtc_tools/loopback_test/stat_tracker.js b/rtc_tools/loopback_test/stat_tracker.js
similarity index 100%
rename from webrtc/rtc_tools/loopback_test/stat_tracker.js
rename to rtc_tools/loopback_test/stat_tracker.js
diff --git a/webrtc/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
similarity index 100%
rename from webrtc/rtc_tools/network_tester/BUILD.gn
rename to rtc_tools/network_tester/BUILD.gn
diff --git a/webrtc/rtc_tools/network_tester/README b/rtc_tools/network_tester/README
similarity index 100%
rename from webrtc/rtc_tools/network_tester/README
rename to rtc_tools/network_tester/README
diff --git a/webrtc/rtc_tools/network_tester/androidapp/AndroidManifest.xml b/rtc_tools/network_tester/androidapp/AndroidManifest.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/AndroidManifest.xml
rename to rtc_tools/network_tester/androidapp/AndroidManifest.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/layout/activity_main.xml b/rtc_tools/network_tester/androidapp/res/layout/activity_main.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/layout/activity_main.xml
rename to rtc_tools/network_tester/androidapp/res/layout/activity_main.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/mipmap-hdpi/ic_launcher.png b/rtc_tools/network_tester/androidapp/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/mipmap-hdpi/ic_launcher.png
rename to rtc_tools/network_tester/androidapp/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/mipmap-mdpi/ic_launcher.png b/rtc_tools/network_tester/androidapp/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/mipmap-mdpi/ic_launcher.png
rename to rtc_tools/network_tester/androidapp/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xhdpi/ic_launcher.png b/rtc_tools/network_tester/androidapp/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xhdpi/ic_launcher.png
rename to rtc_tools/network_tester/androidapp/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xxhdpi/ic_launcher.png b/rtc_tools/network_tester/androidapp/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xxhdpi/ic_launcher.png
rename to rtc_tools/network_tester/androidapp/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xxxhdpi/ic_launcher.png b/rtc_tools/network_tester/androidapp/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/mipmap-xxxhdpi/ic_launcher.png
rename to rtc_tools/network_tester/androidapp/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/values-v17/styles.xml b/rtc_tools/network_tester/androidapp/res/values-v17/styles.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/values-v17/styles.xml
rename to rtc_tools/network_tester/androidapp/res/values-v17/styles.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/values-w820dp/dimens.xml b/rtc_tools/network_tester/androidapp/res/values-w820dp/dimens.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/values-w820dp/dimens.xml
rename to rtc_tools/network_tester/androidapp/res/values-w820dp/dimens.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/values/colors.xml b/rtc_tools/network_tester/androidapp/res/values/colors.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/values/colors.xml
rename to rtc_tools/network_tester/androidapp/res/values/colors.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/values/dimens.xml b/rtc_tools/network_tester/androidapp/res/values/dimens.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/values/dimens.xml
rename to rtc_tools/network_tester/androidapp/res/values/dimens.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/res/values/strings.xml b/rtc_tools/network_tester/androidapp/res/values/strings.xml
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/res/values/strings.xml
rename to rtc_tools/network_tester/androidapp/res/values/strings.xml
diff --git a/webrtc/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java b/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
rename to rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
diff --git a/webrtc/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/NetworkTester.java b/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/NetworkTester.java
similarity index 100%
rename from webrtc/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/NetworkTester.java
rename to rtc_tools/network_tester/androidapp/src/com/google/media/networktester/NetworkTester.java
diff --git a/webrtc/rtc_tools/network_tester/config_reader.cc b/rtc_tools/network_tester/config_reader.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/config_reader.cc
rename to rtc_tools/network_tester/config_reader.cc
diff --git a/webrtc/rtc_tools/network_tester/config_reader.h b/rtc_tools/network_tester/config_reader.h
similarity index 100%
rename from webrtc/rtc_tools/network_tester/config_reader.h
rename to rtc_tools/network_tester/config_reader.h
diff --git a/webrtc/rtc_tools/network_tester/create_network_tester_config.py b/rtc_tools/network_tester/create_network_tester_config.py
similarity index 100%
rename from webrtc/rtc_tools/network_tester/create_network_tester_config.py
rename to rtc_tools/network_tester/create_network_tester_config.py
diff --git a/webrtc/rtc_tools/network_tester/jni.cpp b/rtc_tools/network_tester/jni.cpp
similarity index 100%
rename from webrtc/rtc_tools/network_tester/jni.cpp
rename to rtc_tools/network_tester/jni.cpp
diff --git a/webrtc/rtc_tools/network_tester/network_tester_config.proto b/rtc_tools/network_tester/network_tester_config.proto
similarity index 100%
rename from webrtc/rtc_tools/network_tester/network_tester_config.proto
rename to rtc_tools/network_tester/network_tester_config.proto
diff --git a/webrtc/rtc_tools/network_tester/network_tester_packet.proto b/rtc_tools/network_tester/network_tester_packet.proto
similarity index 100%
rename from webrtc/rtc_tools/network_tester/network_tester_packet.proto
rename to rtc_tools/network_tester/network_tester_packet.proto
diff --git a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc b/rtc_tools/network_tester/network_tester_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/network_tester_unittest.cc
rename to rtc_tools/network_tester/network_tester_unittest.cc
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.cc b/rtc_tools/network_tester/packet_logger.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/packet_logger.cc
rename to rtc_tools/network_tester/packet_logger.cc
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.h b/rtc_tools/network_tester/packet_logger.h
similarity index 100%
rename from webrtc/rtc_tools/network_tester/packet_logger.h
rename to rtc_tools/network_tester/packet_logger.h
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/packet_sender.cc
rename to rtc_tools/network_tester/packet_sender.cc
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h
similarity index 100%
rename from webrtc/rtc_tools/network_tester/packet_sender.h
rename to rtc_tools/network_tester/packet_sender.h
diff --git a/webrtc/rtc_tools/network_tester/parse_packet_log.py b/rtc_tools/network_tester/parse_packet_log.py
similarity index 100%
rename from webrtc/rtc_tools/network_tester/parse_packet_log.py
rename to rtc_tools/network_tester/parse_packet_log.py
diff --git a/webrtc/rtc_tools/network_tester/server.cc b/rtc_tools/network_tester/server.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/server.cc
rename to rtc_tools/network_tester/server.cc
diff --git a/webrtc/rtc_tools/network_tester/test_controller.cc b/rtc_tools/network_tester/test_controller.cc
similarity index 100%
rename from webrtc/rtc_tools/network_tester/test_controller.cc
rename to rtc_tools/network_tester/test_controller.cc
diff --git a/webrtc/rtc_tools/network_tester/test_controller.h b/rtc_tools/network_tester/test_controller.h
similarity index 100%
rename from webrtc/rtc_tools/network_tester/test_controller.h
rename to rtc_tools/network_tester/test_controller.h
diff --git a/webrtc/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
similarity index 100%
rename from webrtc/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
rename to rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/README b/rtc_tools/py_event_log_analyzer/README
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/README
rename to rtc_tools/py_event_log_analyzer/README
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/misc.py b/rtc_tools/py_event_log_analyzer/misc.py
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/misc.py
rename to rtc_tools/py_event_log_analyzer/misc.py
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/misc_test.py b/rtc_tools/py_event_log_analyzer/misc_test.py
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/misc_test.py
rename to rtc_tools/py_event_log_analyzer/misc_test.py
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/pb_parse.py b/rtc_tools/py_event_log_analyzer/pb_parse.py
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/pb_parse.py
rename to rtc_tools/py_event_log_analyzer/pb_parse.py
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer.py b/rtc_tools/py_event_log_analyzer/rtp_analyzer.py
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer.py
rename to rtc_tools/py_event_log_analyzer/rtp_analyzer.py
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer.sh b/rtc_tools/py_event_log_analyzer/rtp_analyzer.sh
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer.sh
rename to rtc_tools/py_event_log_analyzer/rtp_analyzer.sh
diff --git a/webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer_test.py b/rtc_tools/py_event_log_analyzer/rtp_analyzer_test.py
similarity index 100%
rename from webrtc/rtc_tools/py_event_log_analyzer/rtp_analyzer_test.py
rename to rtc_tools/py_event_log_analyzer/rtp_analyzer_test.py
diff --git a/webrtc/rtc_tools/rtcbot/OWNERS b/rtc_tools/rtcbot/OWNERS
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/OWNERS
rename to rtc_tools/rtcbot/OWNERS
diff --git a/webrtc/rtc_tools/rtcbot/README b/rtc_tools/rtcbot/README
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/README
rename to rtc_tools/rtcbot/README
diff --git a/webrtc/rtc_tools/rtcbot/bot/api.js b/rtc_tools/rtcbot/bot/api.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/bot/api.js
rename to rtc_tools/rtcbot/bot/api.js
diff --git a/webrtc/rtc_tools/rtcbot/bot/browser/bot.js b/rtc_tools/rtcbot/bot/browser/bot.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/bot/browser/bot.js
rename to rtc_tools/rtcbot/bot/browser/bot.js
diff --git a/webrtc/rtc_tools/rtcbot/bot/browser/index.html b/rtc_tools/rtcbot/bot/browser/index.html
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/bot/browser/index.html
rename to rtc_tools/rtcbot/bot/browser/index.html
diff --git a/webrtc/rtc_tools/rtcbot/botmanager.js b/rtc_tools/rtcbot/botmanager.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/botmanager.js
rename to rtc_tools/rtcbot/botmanager.js
diff --git a/webrtc/rtc_tools/rtcbot/main.js b/rtc_tools/rtcbot/main.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/main.js
rename to rtc_tools/rtcbot/main.js
diff --git a/webrtc/rtc_tools/rtcbot/rtcBotReportVisualizer/index.html b/rtc_tools/rtcbot/rtcBotReportVisualizer/index.html
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/rtcBotReportVisualizer/index.html
rename to rtc_tools/rtcbot/rtcBotReportVisualizer/index.html
diff --git a/webrtc/rtc_tools/rtcbot/rtcBotReportVisualizer/main.js b/rtc_tools/rtcbot/rtcBotReportVisualizer/main.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/rtcBotReportVisualizer/main.js
rename to rtc_tools/rtcbot/rtcBotReportVisualizer/main.js
diff --git a/webrtc/rtc_tools/rtcbot/test.js b/rtc_tools/rtcbot/test.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test.js
rename to rtc_tools/rtcbot/test.js
diff --git a/webrtc/rtc_tools/rtcbot/test/oneWayVideoStreamingWithDownloadingFile.js b/rtc_tools/rtcbot/test/oneWayVideoStreamingWithDownloadingFile.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/oneWayVideoStreamingWithDownloadingFile.js
rename to rtc_tools/rtcbot/test/oneWayVideoStreamingWithDownloadingFile.js
diff --git a/webrtc/rtc_tools/rtcbot/test/ping_pong.js b/rtc_tools/rtcbot/test/ping_pong.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/ping_pong.js
rename to rtc_tools/rtcbot/test/ping_pong.js
diff --git a/webrtc/rtc_tools/rtcbot/test/simple_offer_answer.js b/rtc_tools/rtcbot/test/simple_offer_answer.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/simple_offer_answer.js
rename to rtc_tools/rtcbot/test/simple_offer_answer.js
diff --git a/webrtc/rtc_tools/rtcbot/test/three_bots_video_conference.js b/rtc_tools/rtcbot/test/three_bots_video_conference.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/three_bots_video_conference.js
rename to rtc_tools/rtcbot/test/three_bots_video_conference.js
diff --git a/webrtc/rtc_tools/rtcbot/test/two_way_video_streaming.js b/rtc_tools/rtcbot/test/two_way_video_streaming.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/two_way_video_streaming.js
rename to rtc_tools/rtcbot/test/two_way_video_streaming.js
diff --git a/webrtc/rtc_tools/rtcbot/test/webrtc_video_streaming.js b/rtc_tools/rtcbot/test/webrtc_video_streaming.js
similarity index 100%
rename from webrtc/rtc_tools/rtcbot/test/webrtc_video_streaming.js
rename to rtc_tools/rtcbot/test/webrtc_video_streaming.js
diff --git a/webrtc/rtc_tools/sanitizers_unittest.cc b/rtc_tools/sanitizers_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/sanitizers_unittest.cc
rename to rtc_tools/sanitizers_unittest.cc
diff --git a/webrtc/rtc_tools/simple_command_line_parser.cc b/rtc_tools/simple_command_line_parser.cc
similarity index 100%
rename from webrtc/rtc_tools/simple_command_line_parser.cc
rename to rtc_tools/simple_command_line_parser.cc
diff --git a/webrtc/rtc_tools/simple_command_line_parser.h b/rtc_tools/simple_command_line_parser.h
similarity index 100%
rename from webrtc/rtc_tools/simple_command_line_parser.h
rename to rtc_tools/simple_command_line_parser.h
diff --git a/webrtc/rtc_tools/simple_command_line_parser_unittest.cc b/rtc_tools/simple_command_line_parser_unittest.cc
similarity index 100%
rename from webrtc/rtc_tools/simple_command_line_parser_unittest.cc
rename to rtc_tools/simple_command_line_parser_unittest.cc
diff --git a/webrtc/rtc_tools/testing/README.md b/rtc_tools/testing/README.md
similarity index 100%
rename from webrtc/rtc_tools/testing/README.md
rename to rtc_tools/testing/README.md
diff --git a/webrtc/rtc_tools/testing/build_apprtc.py b/rtc_tools/testing/build_apprtc.py
similarity index 100%
rename from webrtc/rtc_tools/testing/build_apprtc.py
rename to rtc_tools/testing/build_apprtc.py
diff --git a/webrtc/rtc_tools/testing/download_apprtc.py b/rtc_tools/testing/download_apprtc.py
similarity index 100%
rename from webrtc/rtc_tools/testing/download_apprtc.py
rename to rtc_tools/testing/download_apprtc.py
diff --git a/webrtc/rtc_tools/testing/golang/linux/go.tar.gz.sha1 b/rtc_tools/testing/golang/linux/go.tar.gz.sha1
similarity index 100%
rename from webrtc/rtc_tools/testing/golang/linux/go.tar.gz.sha1
rename to rtc_tools/testing/golang/linux/go.tar.gz.sha1
diff --git a/webrtc/rtc_tools/testing/golang/mac/go.tar.gz.sha1 b/rtc_tools/testing/golang/mac/go.tar.gz.sha1
similarity index 100%
rename from webrtc/rtc_tools/testing/golang/mac/go.tar.gz.sha1
rename to rtc_tools/testing/golang/mac/go.tar.gz.sha1
diff --git a/webrtc/rtc_tools/testing/golang/win/go.zip.sha1 b/rtc_tools/testing/golang/win/go.zip.sha1
similarity index 100%
rename from webrtc/rtc_tools/testing/golang/win/go.zip.sha1
rename to rtc_tools/testing/golang/win/go.zip.sha1
diff --git a/webrtc/rtc_tools/testing/prebuilt_apprtc.zip.sha1 b/rtc_tools/testing/prebuilt_apprtc.zip.sha1
similarity index 100%
rename from webrtc/rtc_tools/testing/prebuilt_apprtc.zip.sha1
rename to rtc_tools/testing/prebuilt_apprtc.zip.sha1
diff --git a/webrtc/rtc_tools/testing/setup_apprtc.py b/rtc_tools/testing/setup_apprtc.py
similarity index 100%
rename from webrtc/rtc_tools/testing/setup_apprtc.py
rename to rtc_tools/testing/setup_apprtc.py
diff --git a/webrtc/rtc_tools/testing/utils.py b/rtc_tools/testing/utils.py
similarity index 100%
rename from webrtc/rtc_tools/testing/utils.py
rename to rtc_tools/testing/utils.py
diff --git a/webrtc/rtc_tools/video_analysis.py b/rtc_tools/video_analysis.py
similarity index 100%
rename from webrtc/rtc_tools/video_analysis.py
rename to rtc_tools/video_analysis.py
diff --git a/webrtc/rtc_tools/video_analysis_test.py b/rtc_tools/video_analysis_test.py
similarity index 100%
rename from webrtc/rtc_tools/video_analysis_test.py
rename to rtc_tools/video_analysis_test.py
diff --git a/webrtc/sdk/BUILD.gn b/sdk/BUILD.gn
similarity index 100%
rename from webrtc/sdk/BUILD.gn
rename to sdk/BUILD.gn
diff --git a/webrtc/sdk/OWNERS b/sdk/OWNERS
similarity index 100%
rename from webrtc/sdk/OWNERS
rename to sdk/OWNERS
diff --git a/webrtc/sdk/android/AndroidManifest.xml b/sdk/android/AndroidManifest.xml
similarity index 100%
rename from webrtc/sdk/android/AndroidManifest.xml
rename to sdk/android/AndroidManifest.xml
diff --git a/webrtc/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
similarity index 100%
rename from webrtc/sdk/android/BUILD.gn
rename to sdk/android/BUILD.gn
diff --git a/webrtc/sdk/android/OWNERS b/sdk/android/OWNERS
similarity index 100%
rename from webrtc/sdk/android/OWNERS
rename to sdk/android/OWNERS
diff --git a/webrtc/sdk/android/PRESUBMIT.py b/sdk/android/PRESUBMIT.py
similarity index 100%
rename from webrtc/sdk/android/PRESUBMIT.py
rename to sdk/android/PRESUBMIT.py
diff --git a/webrtc/sdk/android/README b/sdk/android/README
similarity index 100%
rename from webrtc/sdk/android/README
rename to sdk/android/README
diff --git a/webrtc/sdk/android/api/org/webrtc/AudioSource.java b/sdk/android/api/org/webrtc/AudioSource.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/AudioSource.java
rename to sdk/android/api/org/webrtc/AudioSource.java
diff --git a/webrtc/sdk/android/api/org/webrtc/AudioTrack.java b/sdk/android/api/org/webrtc/AudioTrack.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/AudioTrack.java
rename to sdk/android/api/org/webrtc/AudioTrack.java
diff --git a/webrtc/sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java b/sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java
rename to sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java b/sdk/android/api/org/webrtc/Camera1Capturer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
rename to sdk/android/api/org/webrtc/Camera1Capturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java b/sdk/android/api/org/webrtc/Camera1Enumerator.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java
rename to sdk/android/api/org/webrtc/Camera1Enumerator.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java b/sdk/android/api/org/webrtc/Camera2Capturer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java
rename to sdk/android/api/org/webrtc/Camera2Capturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java b/sdk/android/api/org/webrtc/Camera2Enumerator.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java
rename to sdk/android/api/org/webrtc/Camera2Enumerator.java
diff --git a/webrtc/sdk/android/api/org/webrtc/CameraEnumerationAndroid.java b/sdk/android/api/org/webrtc/CameraEnumerationAndroid.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/CameraEnumerationAndroid.java
rename to sdk/android/api/org/webrtc/CameraEnumerationAndroid.java
diff --git a/webrtc/sdk/android/api/org/webrtc/CameraEnumerator.java b/sdk/android/api/org/webrtc/CameraEnumerator.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/CameraEnumerator.java
rename to sdk/android/api/org/webrtc/CameraEnumerator.java
diff --git a/webrtc/sdk/android/api/org/webrtc/CameraVideoCapturer.java b/sdk/android/api/org/webrtc/CameraVideoCapturer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/CameraVideoCapturer.java
rename to sdk/android/api/org/webrtc/CameraVideoCapturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/DataChannel.java b/sdk/android/api/org/webrtc/DataChannel.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/DataChannel.java
rename to sdk/android/api/org/webrtc/DataChannel.java
diff --git a/webrtc/sdk/android/api/org/webrtc/DtmfSender.java b/sdk/android/api/org/webrtc/DtmfSender.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/DtmfSender.java
rename to sdk/android/api/org/webrtc/DtmfSender.java
diff --git a/webrtc/sdk/android/api/org/webrtc/EglBase.java b/sdk/android/api/org/webrtc/EglBase.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/EglBase.java
rename to sdk/android/api/org/webrtc/EglBase.java
diff --git a/webrtc/sdk/android/api/org/webrtc/EglRenderer.java b/sdk/android/api/org/webrtc/EglRenderer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/EglRenderer.java
rename to sdk/android/api/org/webrtc/EglRenderer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/EncodedImage.java
rename to sdk/android/api/org/webrtc/EncodedImage.java
diff --git a/webrtc/sdk/android/api/org/webrtc/FileVideoCapturer.java b/sdk/android/api/org/webrtc/FileVideoCapturer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/FileVideoCapturer.java
rename to sdk/android/api/org/webrtc/FileVideoCapturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/GlRectDrawer.java b/sdk/android/api/org/webrtc/GlRectDrawer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/GlRectDrawer.java
rename to sdk/android/api/org/webrtc/GlRectDrawer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/GlShader.java b/sdk/android/api/org/webrtc/GlShader.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/GlShader.java
rename to sdk/android/api/org/webrtc/GlShader.java
diff --git a/webrtc/sdk/android/api/org/webrtc/GlTextureFrameBuffer.java b/sdk/android/api/org/webrtc/GlTextureFrameBuffer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/GlTextureFrameBuffer.java
rename to sdk/android/api/org/webrtc/GlTextureFrameBuffer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/GlUtil.java b/sdk/android/api/org/webrtc/GlUtil.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/GlUtil.java
rename to sdk/android/api/org/webrtc/GlUtil.java
diff --git a/webrtc/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
rename to sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
rename to sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/IceCandidate.java b/sdk/android/api/org/webrtc/IceCandidate.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/IceCandidate.java
rename to sdk/android/api/org/webrtc/IceCandidate.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
rename to sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
rename to sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaConstraints.java b/sdk/android/api/org/webrtc/MediaConstraints.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaConstraints.java
rename to sdk/android/api/org/webrtc/MediaConstraints.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaSource.java b/sdk/android/api/org/webrtc/MediaSource.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaSource.java
rename to sdk/android/api/org/webrtc/MediaSource.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaStream.java b/sdk/android/api/org/webrtc/MediaStream.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaStream.java
rename to sdk/android/api/org/webrtc/MediaStream.java
diff --git a/webrtc/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/MediaStreamTrack.java
rename to sdk/android/api/org/webrtc/MediaStreamTrack.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Metrics.java b/sdk/android/api/org/webrtc/Metrics.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/Metrics.java
rename to sdk/android/api/org/webrtc/Metrics.java
diff --git a/webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java b/sdk/android/api/org/webrtc/NetworkMonitor.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java
rename to sdk/android/api/org/webrtc/NetworkMonitor.java
diff --git a/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
rename to sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
diff --git a/webrtc/sdk/android/api/org/webrtc/OWNERS b/sdk/android/api/org/webrtc/OWNERS
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/OWNERS
rename to sdk/android/api/org/webrtc/OWNERS
diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/PeerConnection.java
rename to sdk/android/api/org/webrtc/PeerConnection.java
diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
rename to sdk/android/api/org/webrtc/PeerConnectionFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RTCStats.java b/sdk/android/api/org/webrtc/RTCStats.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RTCStats.java
rename to sdk/android/api/org/webrtc/RTCStats.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RTCStatsCollectorCallback.java b/sdk/android/api/org/webrtc/RTCStatsCollectorCallback.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RTCStatsCollectorCallback.java
rename to sdk/android/api/org/webrtc/RTCStatsCollectorCallback.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RTCStatsReport.java b/sdk/android/api/org/webrtc/RTCStatsReport.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RTCStatsReport.java
rename to sdk/android/api/org/webrtc/RTCStatsReport.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RendererCommon.java b/sdk/android/api/org/webrtc/RendererCommon.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RendererCommon.java
rename to sdk/android/api/org/webrtc/RendererCommon.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RtpParameters.java b/sdk/android/api/org/webrtc/RtpParameters.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RtpParameters.java
rename to sdk/android/api/org/webrtc/RtpParameters.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RtpReceiver.java b/sdk/android/api/org/webrtc/RtpReceiver.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RtpReceiver.java
rename to sdk/android/api/org/webrtc/RtpReceiver.java
diff --git a/webrtc/sdk/android/api/org/webrtc/RtpSender.java b/sdk/android/api/org/webrtc/RtpSender.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/RtpSender.java
rename to sdk/android/api/org/webrtc/RtpSender.java
diff --git a/webrtc/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java b/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
rename to sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
diff --git a/webrtc/sdk/android/api/org/webrtc/SdpObserver.java b/sdk/android/api/org/webrtc/SdpObserver.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/SdpObserver.java
rename to sdk/android/api/org/webrtc/SdpObserver.java
diff --git a/webrtc/sdk/android/api/org/webrtc/SessionDescription.java b/sdk/android/api/org/webrtc/SessionDescription.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/SessionDescription.java
rename to sdk/android/api/org/webrtc/SessionDescription.java
diff --git a/webrtc/sdk/android/api/org/webrtc/StatsObserver.java b/sdk/android/api/org/webrtc/StatsObserver.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/StatsObserver.java
rename to sdk/android/api/org/webrtc/StatsObserver.java
diff --git a/webrtc/sdk/android/api/org/webrtc/StatsReport.java b/sdk/android/api/org/webrtc/StatsReport.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/StatsReport.java
rename to sdk/android/api/org/webrtc/StatsReport.java
diff --git a/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
rename to sdk/android/api/org/webrtc/SurfaceTextureHelper.java
diff --git a/webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java b/sdk/android/api/org/webrtc/SurfaceViewRenderer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java
rename to sdk/android/api/org/webrtc/SurfaceViewRenderer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoCapturer.java b/sdk/android/api/org/webrtc/VideoCapturer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoCapturer.java
rename to sdk/android/api/org/webrtc/VideoCapturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoCodecInfo.java b/sdk/android/api/org/webrtc/VideoCodecInfo.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoCodecInfo.java
rename to sdk/android/api/org/webrtc/VideoCodecInfo.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoCodecStatus.java b/sdk/android/api/org/webrtc/VideoCodecStatus.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoCodecStatus.java
rename to sdk/android/api/org/webrtc/VideoCodecStatus.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoDecoder.java b/sdk/android/api/org/webrtc/VideoDecoder.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoDecoder.java
rename to sdk/android/api/org/webrtc/VideoDecoder.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoDecoderFactory.java b/sdk/android/api/org/webrtc/VideoDecoderFactory.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoDecoderFactory.java
rename to sdk/android/api/org/webrtc/VideoDecoderFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoEncoder.java
rename to sdk/android/api/org/webrtc/VideoEncoder.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoEncoderFactory.java b/sdk/android/api/org/webrtc/VideoEncoderFactory.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoEncoderFactory.java
rename to sdk/android/api/org/webrtc/VideoEncoderFactory.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoFileRenderer.java b/sdk/android/api/org/webrtc/VideoFileRenderer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoFileRenderer.java
rename to sdk/android/api/org/webrtc/VideoFileRenderer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoFrame.java b/sdk/android/api/org/webrtc/VideoFrame.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoFrame.java
rename to sdk/android/api/org/webrtc/VideoFrame.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java b/sdk/android/api/org/webrtc/VideoFrameDrawer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java
rename to sdk/android/api/org/webrtc/VideoFrameDrawer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoRenderer.java b/sdk/android/api/org/webrtc/VideoRenderer.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoRenderer.java
rename to sdk/android/api/org/webrtc/VideoRenderer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoSink.java b/sdk/android/api/org/webrtc/VideoSink.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoSink.java
rename to sdk/android/api/org/webrtc/VideoSink.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoSource.java b/sdk/android/api/org/webrtc/VideoSource.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoSource.java
rename to sdk/android/api/org/webrtc/VideoSource.java
diff --git a/webrtc/sdk/android/api/org/webrtc/VideoTrack.java b/sdk/android/api/org/webrtc/VideoTrack.java
similarity index 100%
rename from webrtc/sdk/android/api/org/webrtc/VideoTrack.java
rename to sdk/android/api/org/webrtc/VideoTrack.java
diff --git a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml b/sdk/android/instrumentationtests/AndroidManifest.xml
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
rename to sdk/android/instrumentationtests/AndroidManifest.xml
diff --git a/webrtc/sdk/android/instrumentationtests/ant.properties b/sdk/android/instrumentationtests/ant.properties
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/ant.properties
rename to sdk/android/instrumentationtests/ant.properties
diff --git a/webrtc/sdk/android/instrumentationtests/build.xml b/sdk/android/instrumentationtests/build.xml
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/build.xml
rename to sdk/android/instrumentationtests/build.xml
diff --git a/webrtc/sdk/android/instrumentationtests/project.properties b/sdk/android/instrumentationtests/project.properties
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/project.properties
rename to sdk/android/instrumentationtests/project.properties
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
rename to sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java
rename to sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m b/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m
similarity index 100%
rename from webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m
rename to sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m
diff --git a/webrtc/sdk/android/src/java/org/webrtc/AndroidVideoTrackSourceObserver.java b/sdk/android/src/java/org/webrtc/AndroidVideoTrackSourceObserver.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/AndroidVideoTrackSourceObserver.java
rename to sdk/android/src/java/org/webrtc/AndroidVideoTrackSourceObserver.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/BaseBitrateAdjuster.java b/sdk/android/src/java/org/webrtc/BaseBitrateAdjuster.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/BaseBitrateAdjuster.java
rename to sdk/android/src/java/org/webrtc/BaseBitrateAdjuster.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/BitrateAdjuster.java b/sdk/android/src/java/org/webrtc/BitrateAdjuster.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/BitrateAdjuster.java
rename to sdk/android/src/java/org/webrtc/BitrateAdjuster.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/Camera1Session.java b/sdk/android/src/java/org/webrtc/Camera1Session.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/Camera1Session.java
rename to sdk/android/src/java/org/webrtc/Camera1Session.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java b/sdk/android/src/java/org/webrtc/Camera2Session.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java
rename to sdk/android/src/java/org/webrtc/Camera2Session.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java
rename to sdk/android/src/java/org/webrtc/CameraCapturer.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/CameraSession.java b/sdk/android/src/java/org/webrtc/CameraSession.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/CameraSession.java
rename to sdk/android/src/java/org/webrtc/CameraSession.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/DynamicBitrateAdjuster.java b/sdk/android/src/java/org/webrtc/DynamicBitrateAdjuster.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/DynamicBitrateAdjuster.java
rename to sdk/android/src/java/org/webrtc/DynamicBitrateAdjuster.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/EglBase10.java b/sdk/android/src/java/org/webrtc/EglBase10.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/EglBase10.java
rename to sdk/android/src/java/org/webrtc/EglBase10.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/EglBase14.java b/sdk/android/src/java/org/webrtc/EglBase14.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/EglBase14.java
rename to sdk/android/src/java/org/webrtc/EglBase14.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/FramerateBitrateAdjuster.java b/sdk/android/src/java/org/webrtc/FramerateBitrateAdjuster.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/FramerateBitrateAdjuster.java
rename to sdk/android/src/java/org/webrtc/FramerateBitrateAdjuster.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java b/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java
rename to sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java b/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
rename to sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/Histogram.java b/sdk/android/src/java/org/webrtc/Histogram.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/Histogram.java
rename to sdk/android/src/java/org/webrtc/Histogram.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/I420BufferImpl.java b/sdk/android/src/java/org/webrtc/I420BufferImpl.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/I420BufferImpl.java
rename to sdk/android/src/java/org/webrtc/I420BufferImpl.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/JniCommon.java b/sdk/android/src/java/org/webrtc/JniCommon.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/JniCommon.java
rename to sdk/android/src/java/org/webrtc/JniCommon.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/MediaCodecUtils.java b/sdk/android/src/java/org/webrtc/MediaCodecUtils.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/MediaCodecUtils.java
rename to sdk/android/src/java/org/webrtc/MediaCodecUtils.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/NV12Buffer.java b/sdk/android/src/java/org/webrtc/NV12Buffer.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/NV12Buffer.java
rename to sdk/android/src/java/org/webrtc/NV12Buffer.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java b/sdk/android/src/java/org/webrtc/NV21Buffer.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java
rename to sdk/android/src/java/org/webrtc/NV21Buffer.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/TextureBufferImpl.java b/sdk/android/src/java/org/webrtc/TextureBufferImpl.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/TextureBufferImpl.java
rename to sdk/android/src/java/org/webrtc/TextureBufferImpl.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/VideoCodecType.java b/sdk/android/src/java/org/webrtc/VideoCodecType.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/VideoCodecType.java
rename to sdk/android/src/java/org/webrtc/VideoCodecType.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/VideoDecoderWrapperCallback.java b/sdk/android/src/java/org/webrtc/VideoDecoderWrapperCallback.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/VideoDecoderWrapperCallback.java
rename to sdk/android/src/java/org/webrtc/VideoDecoderWrapperCallback.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/VideoEncoderWrapperCallback.java b/sdk/android/src/java/org/webrtc/VideoEncoderWrapperCallback.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/VideoEncoderWrapperCallback.java
rename to sdk/android/src/java/org/webrtc/VideoEncoderWrapperCallback.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/WrappedNativeI420Buffer.java b/sdk/android/src/java/org/webrtc/WrappedNativeI420Buffer.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/WrappedNativeI420Buffer.java
rename to sdk/android/src/java/org/webrtc/WrappedNativeI420Buffer.java
diff --git a/webrtc/sdk/android/src/java/org/webrtc/YuvConverter.java b/sdk/android/src/java/org/webrtc/YuvConverter.java
similarity index 100%
rename from webrtc/sdk/android/src/java/org/webrtc/YuvConverter.java
rename to sdk/android/src/java/org/webrtc/YuvConverter.java
diff --git a/webrtc/sdk/android/src/jni/DEPS b/sdk/android/src/jni/DEPS
similarity index 100%
rename from webrtc/sdk/android/src/jni/DEPS
rename to sdk/android/src/jni/DEPS
diff --git a/webrtc/sdk/android/src/jni/OWNERS b/sdk/android/src/jni/OWNERS
similarity index 100%
rename from webrtc/sdk/android/src/jni/OWNERS
rename to sdk/android/src/jni/OWNERS
diff --git a/webrtc/sdk/android/src/jni/androidhistogram_jni.cc b/sdk/android/src/jni/androidhistogram_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidhistogram_jni.cc
rename to sdk/android/src/jni/androidhistogram_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h b/sdk/android/src/jni/androidmediacodeccommon.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmediacodeccommon.h
rename to sdk/android/src/jni/androidmediacodeccommon.h
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/sdk/android/src/jni/androidmediadecoder_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
rename to sdk/android/src/jni/androidmediadecoder_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.h b/sdk/android/src/jni/androidmediadecoder_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmediadecoder_jni.h
rename to sdk/android/src/jni/androidmediadecoder_jni.h
diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc b/sdk/android/src/jni/androidmediaencoder_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
rename to sdk/android/src/jni/androidmediaencoder_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h b/sdk/android/src/jni/androidmediaencoder_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
rename to sdk/android/src/jni/androidmediaencoder_jni.h
diff --git a/webrtc/sdk/android/src/jni/androidmetrics_jni.cc b/sdk/android/src/jni/androidmetrics_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidmetrics_jni.cc
rename to sdk/android/src/jni/androidmetrics_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/sdk/android/src/jni/androidnetworkmonitor_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
rename to sdk/android/src/jni/androidnetworkmonitor_jni.h
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.cc b/sdk/android/src/jni/androidvideotracksource.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidvideotracksource.cc
rename to sdk/android/src/jni/androidvideotracksource.cc
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.h b/sdk/android/src/jni/androidvideotracksource.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidvideotracksource.h
rename to sdk/android/src/jni/androidvideotracksource.h
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc b/sdk/android/src/jni/androidvideotracksource_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
rename to sdk/android/src/jni/androidvideotracksource_jni.cc
diff --git a/webrtc/sdk/android/src/jni/classreferenceholder.cc b/sdk/android/src/jni/classreferenceholder.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/classreferenceholder.cc
rename to sdk/android/src/jni/classreferenceholder.cc
diff --git a/webrtc/sdk/android/src/jni/classreferenceholder.h b/sdk/android/src/jni/classreferenceholder.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/classreferenceholder.h
rename to sdk/android/src/jni/classreferenceholder.h
diff --git a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc b/sdk/android/src/jni/filevideocapturer_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
rename to sdk/android/src/jni/filevideocapturer_jni.cc
diff --git a/webrtc/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/jni_common.cc
rename to sdk/android/src/jni/jni_common.cc
diff --git a/webrtc/sdk/android/src/jni/jni_helpers.cc b/sdk/android/src/jni/jni_helpers.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/jni_helpers.cc
rename to sdk/android/src/jni/jni_helpers.cc
diff --git a/webrtc/sdk/android/src/jni/jni_helpers.h b/sdk/android/src/jni/jni_helpers.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/jni_helpers.h
rename to sdk/android/src/jni/jni_helpers.h
diff --git a/webrtc/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/jni_onload.cc
rename to sdk/android/src/jni/jni_onload.cc
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.cc b/sdk/android/src/jni/native_handle_impl.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/native_handle_impl.cc
rename to sdk/android/src/jni/native_handle_impl.cc
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.h b/sdk/android/src/jni/native_handle_impl.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/native_handle_impl.h
rename to sdk/android/src/jni/native_handle_impl.h
diff --git a/webrtc/sdk/android/src/jni/nv12buffer_jni.cc b/sdk/android/src/jni/nv12buffer_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/nv12buffer_jni.cc
rename to sdk/android/src/jni/nv12buffer_jni.cc
diff --git a/webrtc/sdk/android/src/jni/nv21buffer_jni.cc b/sdk/android/src/jni/nv21buffer_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/nv21buffer_jni.cc
rename to sdk/android/src/jni/nv21buffer_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/OWNERS b/sdk/android/src/jni/pc/OWNERS
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/OWNERS
rename to sdk/android/src/jni/pc/OWNERS
diff --git a/webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
rename to sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
rename to sdk/android/src/jni/pc/androidnetworkmonitor_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/audio_jni.cc b/sdk/android/src/jni/pc/audio_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/audio_jni.cc
rename to sdk/android/src/jni/pc/audio_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/audio_jni.h b/sdk/android/src/jni/pc/audio_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/audio_jni.h
rename to sdk/android/src/jni/pc/audio_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/audiotrack_jni.cc b/sdk/android/src/jni/pc/audiotrack_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/audiotrack_jni.cc
rename to sdk/android/src/jni/pc/audiotrack_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc b/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
rename to sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/datachannel_jni.cc b/sdk/android/src/jni/pc/datachannel_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/datachannel_jni.cc
rename to sdk/android/src/jni/pc/datachannel_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.cc b/sdk/android/src/jni/pc/datachannelobserver_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.cc
rename to sdk/android/src/jni/pc/datachannelobserver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h b/sdk/android/src/jni/pc/datachannelobserver_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h
rename to sdk/android/src/jni/pc/datachannelobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc b/sdk/android/src/jni/pc/dtmfsender_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
rename to sdk/android/src/jni/pc/dtmfsender_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/java_native_conversion.cc b/sdk/android/src/jni/pc/java_native_conversion.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/java_native_conversion.cc
rename to sdk/android/src/jni/pc/java_native_conversion.cc
diff --git a/webrtc/sdk/android/src/jni/pc/java_native_conversion.h b/sdk/android/src/jni/pc/java_native_conversion.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/java_native_conversion.h
rename to sdk/android/src/jni/pc/java_native_conversion.h
diff --git a/webrtc/sdk/android/src/jni/pc/logging_jni.cc b/sdk/android/src/jni/pc/logging_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/logging_jni.cc
rename to sdk/android/src/jni/pc/logging_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/media_jni.cc b/sdk/android/src/jni/pc/media_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/media_jni.cc
rename to sdk/android/src/jni/pc/media_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/media_jni.h b/sdk/android/src/jni/pc/media_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/media_jni.h
rename to sdk/android/src/jni/pc/media_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.cc b/sdk/android/src/jni/pc/mediaconstraints_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.cc
rename to sdk/android/src/jni/pc/mediaconstraints_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h b/sdk/android/src/jni/pc/mediaconstraints_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h
rename to sdk/android/src/jni/pc/mediaconstraints_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/mediasource_jni.cc b/sdk/android/src/jni/pc/mediasource_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/mediasource_jni.cc
rename to sdk/android/src/jni/pc/mediasource_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc b/sdk/android/src/jni/pc/mediastream_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
rename to sdk/android/src/jni/pc/mediastream_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc b/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
rename to sdk/android/src/jni/pc/mediastreamtrack_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/null_audio_jni.cc b/sdk/android/src/jni/pc/null_audio_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/null_audio_jni.cc
rename to sdk/android/src/jni/pc/null_audio_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/null_media_jni.cc b/sdk/android/src/jni/pc/null_media_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/null_media_jni.cc
rename to sdk/android/src/jni/pc/null_media_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/null_video_jni.cc b/sdk/android/src/jni/pc/null_video_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/null_video_jni.cc
rename to sdk/android/src/jni/pc/null_video_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.cc b/sdk/android/src/jni/pc/ownedfactoryandthreads.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.cc
rename to sdk/android/src/jni/pc/ownedfactoryandthreads.cc
diff --git a/webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h b/sdk/android/src/jni/pc/ownedfactoryandthreads.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h
rename to sdk/android/src/jni/pc/ownedfactoryandthreads.h
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnection_jni.cc b/sdk/android/src/jni/pc/peerconnection_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/peerconnection_jni.cc
rename to sdk/android/src/jni/pc/peerconnection_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
rename to sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc b/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
rename to sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h b/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
rename to sdk/android/src/jni/pc/peerconnectionobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
rename to sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
diff --git a/webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
rename to sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
diff --git a/webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc b/sdk/android/src/jni/pc/rtpreceiver_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc
rename to sdk/android/src/jni/pc/rtpreceiver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
rename to sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
rename to sdk/android/src/jni/pc/rtpreceiverobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc b/sdk/android/src/jni/pc/rtpsender_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc
rename to sdk/android/src/jni/pc/rtpsender_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h b/sdk/android/src/jni/pc/sdpobserver_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h
rename to sdk/android/src/jni/pc/sdpobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/statsobserver_jni.cc b/sdk/android/src/jni/pc/statsobserver_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/statsobserver_jni.cc
rename to sdk/android/src/jni/pc/statsobserver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/statsobserver_jni.h b/sdk/android/src/jni/pc/statsobserver_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/statsobserver_jni.h
rename to sdk/android/src/jni/pc/statsobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/video_jni.cc b/sdk/android/src/jni/pc/video_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/video_jni.cc
rename to sdk/android/src/jni/pc/video_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/video_jni.h b/sdk/android/src/jni/pc/video_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/pc/video_jni.h
rename to sdk/android/src/jni/pc/video_jni.h
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc b/sdk/android/src/jni/surfacetexturehelper_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
rename to sdk/android/src/jni/surfacetexturehelper_jni.cc
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h b/sdk/android/src/jni/surfacetexturehelper_jni.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
rename to sdk/android/src/jni/surfacetexturehelper_jni.h
diff --git a/webrtc/sdk/android/src/jni/video_renderer_jni.cc b/sdk/android/src/jni/video_renderer_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/video_renderer_jni.cc
rename to sdk/android/src/jni/video_renderer_jni.cc
diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc b/sdk/android/src/jni/videodecoderfactorywrapper.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
rename to sdk/android/src/jni/videodecoderfactorywrapper.cc
diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h b/sdk/android/src/jni/videodecoderfactorywrapper.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h
rename to sdk/android/src/jni/videodecoderfactorywrapper.h
diff --git a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc b/sdk/android/src/jni/videodecoderwrapper.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videodecoderwrapper.cc
rename to sdk/android/src/jni/videodecoderwrapper.cc
diff --git a/webrtc/sdk/android/src/jni/videodecoderwrapper.h b/sdk/android/src/jni/videodecoderwrapper.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/videodecoderwrapper.h
rename to sdk/android/src/jni/videodecoderwrapper.h
diff --git a/webrtc/sdk/android/src/jni/videoencoderfactorywrapper.cc b/sdk/android/src/jni/videoencoderfactorywrapper.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videoencoderfactorywrapper.cc
rename to sdk/android/src/jni/videoencoderfactorywrapper.cc
diff --git a/webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h b/sdk/android/src/jni/videoencoderfactorywrapper.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h
rename to sdk/android/src/jni/videoencoderfactorywrapper.h
diff --git a/webrtc/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videoencoderwrapper.cc
rename to sdk/android/src/jni/videoencoderwrapper.cc
diff --git a/webrtc/sdk/android/src/jni/videoencoderwrapper.h b/sdk/android/src/jni/videoencoderwrapper.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/videoencoderwrapper.h
rename to sdk/android/src/jni/videoencoderwrapper.h
diff --git a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc b/sdk/android/src/jni/videofilerenderer_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
rename to sdk/android/src/jni/videofilerenderer_jni.cc
diff --git a/webrtc/sdk/android/src/jni/videoframe_jni.cc b/sdk/android/src/jni/videoframe_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videoframe_jni.cc
rename to sdk/android/src/jni/videoframe_jni.cc
diff --git a/webrtc/sdk/android/src/jni/videotrack_jni.cc b/sdk/android/src/jni/videotrack_jni.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/videotrack_jni.cc
rename to sdk/android/src/jni/videotrack_jni.cc
diff --git a/webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.cc b/sdk/android/src/jni/wrapped_native_i420_buffer.cc
similarity index 100%
rename from webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.cc
rename to sdk/android/src/jni/wrapped_native_i420_buffer.cc
diff --git a/webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h b/sdk/android/src/jni/wrapped_native_i420_buffer.h
similarity index 100%
rename from webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h
rename to sdk/android/src/jni/wrapped_native_i420_buffer.h
diff --git a/webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java b/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
similarity index 100%
rename from webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
rename to sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
diff --git a/webrtc/sdk/objc/DEPS b/sdk/objc/DEPS
similarity index 100%
rename from webrtc/sdk/objc/DEPS
rename to sdk/objc/DEPS
diff --git a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm b/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm
rename to sdk/objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h b/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h
rename to sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm b/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
rename to sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSessionConfiguration.m b/sdk/objc/Framework/Classes/Audio/RTCAudioSessionConfiguration.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSessionConfiguration.m
rename to sdk/objc/Framework/Classes/Audio/RTCAudioSessionConfiguration.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/NSString+StdString.h b/sdk/objc/Framework/Classes/Common/NSString+StdString.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/NSString+StdString.h
rename to sdk/objc/Framework/Classes/Common/NSString+StdString.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/NSString+StdString.mm b/sdk/objc/Framework/Classes/Common/NSString+StdString.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/NSString+StdString.mm
rename to sdk/objc/Framework/Classes/Common/NSString+StdString.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCDispatcher+Private.h b/sdk/objc/Framework/Classes/Common/RTCDispatcher+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCDispatcher+Private.h
rename to sdk/objc/Framework/Classes/Common/RTCDispatcher+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCDispatcher.m b/sdk/objc/Framework/Classes/Common/RTCDispatcher.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCDispatcher.m
rename to sdk/objc/Framework/Classes/Common/RTCDispatcher.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
rename to sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm b/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
rename to sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm b/sdk/objc/Framework/Classes/Common/RTCLogging.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm
rename to sdk/objc/Framework/Classes/Common/RTCLogging.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h
rename to sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
rename to sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/UIDevice+RTCDevice.mm b/sdk/objc/Framework/Classes/Common/UIDevice+RTCDevice.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/UIDevice+RTCDevice.mm
rename to sdk/objc/Framework/Classes/Common/UIDevice+RTCDevice.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/helpers.h b/sdk/objc/Framework/Classes/Common/helpers.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/helpers.h
rename to sdk/objc/Framework/Classes/Common/helpers.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/helpers.mm b/sdk/objc/Framework/Classes/Common/helpers.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Common/helpers.mm
rename to sdk/objc/Framework/Classes/Common/helpers.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.h b/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.h
rename to sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm b/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm
rename to sdk/objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNSVideoView.m b/sdk/objc/Framework/Classes/Metal/RTCMTLNSVideoView.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNSVideoView.m
rename to sdk/objc/Framework/Classes/Metal/RTCMTLNSVideoView.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h b/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h
rename to sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm b/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm
rename to sdk/objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h b/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h
rename to sdk/objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.h b/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.h
rename to sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm b/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
rename to sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m b/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
rename to sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/OWNERS b/sdk/objc/Framework/Classes/PeerConnection/OWNERS
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/OWNERS
rename to sdk/objc/Framework/Classes/PeerConnection/OWNERS
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m b/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m
rename to sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h b/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m b/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m
rename to sdk/objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIceServer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm
rename to sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/UI/RTCCameraPreviewView.m b/sdk/objc/Framework/Classes/UI/RTCCameraPreviewView.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/UI/RTCCameraPreviewView.m
rename to sdk/objc/Framework/Classes/UI/RTCCameraPreviewView.m
diff --git a/webrtc/sdk/objc/Framework/Classes/UI/RTCEAGLVideoView.m b/sdk/objc/Framework/Classes/UI/RTCEAGLVideoView.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/UI/RTCEAGLVideoView.m
rename to sdk/objc/Framework/Classes/UI/RTCEAGLVideoView.m
diff --git a/webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m b/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m
rename to sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h b/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h
rename to sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm b/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm
rename to sdk/objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h b/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h
rename to sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm b/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm
rename to sdk/objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm b/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
rename to sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.h b/sdk/objc/Framework/Classes/Video/RTCDefaultShader.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.h
rename to sdk/objc/Framework/Classes/Video/RTCDefaultShader.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm b/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
rename to sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h b/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h
rename to sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm b/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm
rename to sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.h b/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.h
rename to sdk/objc/Framework/Classes/Video/RTCI420TextureCache.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.mm b/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCI420TextureCache.mm
rename to sdk/objc/Framework/Classes/Video/RTCI420TextureCache.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.h b/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.h
rename to sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.m b/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.m
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.m
rename to sdk/objc/Framework/Classes/Video/RTCNV12TextureCache.m
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCOpenGLDefines.h b/sdk/objc/Framework/Classes/Video/RTCOpenGLDefines.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCOpenGLDefines.h
rename to sdk/objc/Framework/Classes/Video/RTCOpenGLDefines.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.h b/sdk/objc/Framework/Classes/Video/RTCShader.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCShader.h
rename to sdk/objc/Framework/Classes/Video/RTCShader.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm b/sdk/objc/Framework/Classes/Video/RTCShader.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm
rename to sdk/objc/Framework/Classes/Video/RTCShader.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h b/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h
rename to sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.mm b/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.mm
rename to sdk/objc/Framework/Classes/Video/avfoundationformatmapper.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h
rename to sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
rename to sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
rename to sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h
rename to sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h
rename to sdk/objc/Framework/Classes/Video/objc_frame_buffer.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm
rename to sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h b/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
rename to sdk/objc/Framework/Classes/Video/objcvideotracksource.h
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm b/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm
rename to sdk/objc/Framework/Classes/Video/objcvideotracksource.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm
rename to sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
rename to sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc b/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc
rename to sdk/objc/Framework/Classes/VideoToolbox/helpers.cc
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/helpers.h b/sdk/objc/Framework/Classes/VideoToolbox/helpers.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/helpers.h
rename to sdk/objc/Framework/Classes/VideoToolbox/helpers.h
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
rename to sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
rename to sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
rename to sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h
rename to sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm
rename to sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h
rename to sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
rename to sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/OWNERS b/sdk/objc/Framework/Headers/WebRTC/OWNERS
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/OWNERS
rename to sdk/objc/Framework/Headers/WebRTC/OWNERS
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h b/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h b/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIntervalRange.h b/sdk/objc/Framework/Headers/WebRTC/RTCIntervalRange.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCIntervalRange.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCIntervalRange.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h b/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h b/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCLogging.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMacros.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h b/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCTracing.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h
rename to sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h b/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h
rename to sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h b/sdk/objc/Framework/Headers/WebRTC/WebRTC.h
similarity index 100%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h
rename to sdk/objc/Framework/Headers/WebRTC/WebRTC.h
diff --git a/webrtc/sdk/objc/Framework/Info.plist b/sdk/objc/Framework/Info.plist
similarity index 100%
rename from webrtc/sdk/objc/Framework/Info.plist
rename to sdk/objc/Framework/Info.plist
diff --git a/webrtc/sdk/objc/Framework/Modules/module.modulemap b/sdk/objc/Framework/Modules/module.modulemap
similarity index 100%
rename from webrtc/sdk/objc/Framework/Modules/module.modulemap
rename to sdk/objc/Framework/Modules/module.modulemap
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
rename to sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm b/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
rename to sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
rename to sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
rename to sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm b/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
rename to sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm b/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
rename to sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm b/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
rename to sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm b/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
rename to sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm b/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
rename to sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm b/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
rename to sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm b/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
rename to sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm b/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
rename to sdk/objc/Framework/UnitTests/RTCTracingTest.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm b/sdk/objc/Framework/UnitTests/avformatmappertests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
rename to sdk/objc/Framework/UnitTests/avformatmappertests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
rename to sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
similarity index 100%
rename from webrtc/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
rename to sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
diff --git a/webrtc/sdk/objc/OWNERS b/sdk/objc/OWNERS
similarity index 100%
rename from webrtc/sdk/objc/OWNERS
rename to sdk/objc/OWNERS
diff --git a/webrtc/sdk/objc/WebRTC.podspec b/sdk/objc/WebRTC.podspec
similarity index 100%
rename from webrtc/sdk/objc/WebRTC.podspec
rename to sdk/objc/WebRTC.podspec
diff --git a/webrtc/stats/BUILD.gn b/stats/BUILD.gn
similarity index 100%
rename from webrtc/stats/BUILD.gn
rename to stats/BUILD.gn
diff --git a/webrtc/stats/DEPS b/stats/DEPS
similarity index 100%
rename from webrtc/stats/DEPS
rename to stats/DEPS
diff --git a/webrtc/stats/OWNERS b/stats/OWNERS
similarity index 100%
rename from webrtc/stats/OWNERS
rename to stats/OWNERS
diff --git a/webrtc/stats/rtcstats.cc b/stats/rtcstats.cc
similarity index 100%
rename from webrtc/stats/rtcstats.cc
rename to stats/rtcstats.cc
diff --git a/webrtc/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc
similarity index 100%
rename from webrtc/stats/rtcstats_objects.cc
rename to stats/rtcstats_objects.cc
diff --git a/webrtc/stats/rtcstats_unittest.cc b/stats/rtcstats_unittest.cc
similarity index 100%
rename from webrtc/stats/rtcstats_unittest.cc
rename to stats/rtcstats_unittest.cc
diff --git a/webrtc/stats/rtcstatsreport.cc b/stats/rtcstatsreport.cc
similarity index 100%
rename from webrtc/stats/rtcstatsreport.cc
rename to stats/rtcstatsreport.cc
diff --git a/webrtc/stats/rtcstatsreport_unittest.cc b/stats/rtcstatsreport_unittest.cc
similarity index 100%
rename from webrtc/stats/rtcstatsreport_unittest.cc
rename to stats/rtcstatsreport_unittest.cc
diff --git a/webrtc/stats/test/rtcteststats.cc b/stats/test/rtcteststats.cc
similarity index 100%
rename from webrtc/stats/test/rtcteststats.cc
rename to stats/test/rtcteststats.cc
diff --git a/webrtc/stats/test/rtcteststats.h b/stats/test/rtcteststats.h
similarity index 100%
rename from webrtc/stats/test/rtcteststats.h
rename to stats/test/rtcteststats.h
diff --git a/webrtc/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
similarity index 100%
rename from webrtc/system_wrappers/BUILD.gn
rename to system_wrappers/BUILD.gn
diff --git a/webrtc/system_wrappers/DEPS b/system_wrappers/DEPS
similarity index 100%
rename from webrtc/system_wrappers/DEPS
rename to system_wrappers/DEPS
diff --git a/webrtc/system_wrappers/OWNERS b/system_wrappers/OWNERS
similarity index 100%
rename from webrtc/system_wrappers/OWNERS
rename to system_wrappers/OWNERS
diff --git a/webrtc/system_wrappers/include/aligned_array.h b/system_wrappers/include/aligned_array.h
similarity index 100%
rename from webrtc/system_wrappers/include/aligned_array.h
rename to system_wrappers/include/aligned_array.h
diff --git a/webrtc/system_wrappers/include/aligned_malloc.h b/system_wrappers/include/aligned_malloc.h
similarity index 100%
rename from webrtc/system_wrappers/include/aligned_malloc.h
rename to system_wrappers/include/aligned_malloc.h
diff --git a/webrtc/system_wrappers/include/asm_defines.h b/system_wrappers/include/asm_defines.h
similarity index 100%
rename from webrtc/system_wrappers/include/asm_defines.h
rename to system_wrappers/include/asm_defines.h
diff --git a/webrtc/system_wrappers/include/atomic32.h b/system_wrappers/include/atomic32.h
similarity index 100%
rename from webrtc/system_wrappers/include/atomic32.h
rename to system_wrappers/include/atomic32.h
diff --git a/webrtc/system_wrappers/include/clock.h b/system_wrappers/include/clock.h
similarity index 100%
rename from webrtc/system_wrappers/include/clock.h
rename to system_wrappers/include/clock.h
diff --git a/webrtc/system_wrappers/include/cpu_features_wrapper.h b/system_wrappers/include/cpu_features_wrapper.h
similarity index 100%
rename from webrtc/system_wrappers/include/cpu_features_wrapper.h
rename to system_wrappers/include/cpu_features_wrapper.h
diff --git a/webrtc/system_wrappers/include/cpu_info.h b/system_wrappers/include/cpu_info.h
similarity index 100%
rename from webrtc/system_wrappers/include/cpu_info.h
rename to system_wrappers/include/cpu_info.h
diff --git a/webrtc/system_wrappers/include/event_wrapper.h b/system_wrappers/include/event_wrapper.h
similarity index 100%
rename from webrtc/system_wrappers/include/event_wrapper.h
rename to system_wrappers/include/event_wrapper.h
diff --git a/webrtc/system_wrappers/include/field_trial.h b/system_wrappers/include/field_trial.h
similarity index 100%
rename from webrtc/system_wrappers/include/field_trial.h
rename to system_wrappers/include/field_trial.h
diff --git a/webrtc/system_wrappers/include/field_trial_default.h b/system_wrappers/include/field_trial_default.h
similarity index 100%
rename from webrtc/system_wrappers/include/field_trial_default.h
rename to system_wrappers/include/field_trial_default.h
diff --git a/webrtc/system_wrappers/include/file_wrapper.h b/system_wrappers/include/file_wrapper.h
similarity index 100%
rename from webrtc/system_wrappers/include/file_wrapper.h
rename to system_wrappers/include/file_wrapper.h
diff --git a/webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h b/system_wrappers/include/fix_interlocked_exchange_pointer_win.h
similarity index 100%
rename from webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h
rename to system_wrappers/include/fix_interlocked_exchange_pointer_win.h
diff --git a/webrtc/system_wrappers/include/logcat_trace_context.h b/system_wrappers/include/logcat_trace_context.h
similarity index 100%
rename from webrtc/system_wrappers/include/logcat_trace_context.h
rename to system_wrappers/include/logcat_trace_context.h
diff --git a/webrtc/system_wrappers/include/metrics.h b/system_wrappers/include/metrics.h
similarity index 100%
rename from webrtc/system_wrappers/include/metrics.h
rename to system_wrappers/include/metrics.h
diff --git a/webrtc/system_wrappers/include/metrics_default.h b/system_wrappers/include/metrics_default.h
similarity index 100%
rename from webrtc/system_wrappers/include/metrics_default.h
rename to system_wrappers/include/metrics_default.h
diff --git a/webrtc/system_wrappers/include/ntp_time.h b/system_wrappers/include/ntp_time.h
similarity index 100%
rename from webrtc/system_wrappers/include/ntp_time.h
rename to system_wrappers/include/ntp_time.h
diff --git a/webrtc/system_wrappers/include/rtp_to_ntp_estimator.h b/system_wrappers/include/rtp_to_ntp_estimator.h
similarity index 100%
rename from webrtc/system_wrappers/include/rtp_to_ntp_estimator.h
rename to system_wrappers/include/rtp_to_ntp_estimator.h
diff --git a/webrtc/system_wrappers/include/rw_lock_wrapper.h b/system_wrappers/include/rw_lock_wrapper.h
similarity index 100%
rename from webrtc/system_wrappers/include/rw_lock_wrapper.h
rename to system_wrappers/include/rw_lock_wrapper.h
diff --git a/webrtc/system_wrappers/include/sleep.h b/system_wrappers/include/sleep.h
similarity index 100%
rename from webrtc/system_wrappers/include/sleep.h
rename to system_wrappers/include/sleep.h
diff --git a/webrtc/system_wrappers/include/static_instance.h b/system_wrappers/include/static_instance.h
similarity index 100%
rename from webrtc/system_wrappers/include/static_instance.h
rename to system_wrappers/include/static_instance.h
diff --git a/webrtc/system_wrappers/include/timestamp_extrapolator.h b/system_wrappers/include/timestamp_extrapolator.h
similarity index 100%
rename from webrtc/system_wrappers/include/timestamp_extrapolator.h
rename to system_wrappers/include/timestamp_extrapolator.h
diff --git a/webrtc/system_wrappers/include/trace.h b/system_wrappers/include/trace.h
similarity index 100%
rename from webrtc/system_wrappers/include/trace.h
rename to system_wrappers/include/trace.h
diff --git a/webrtc/system_wrappers/source/aligned_array_unittest.cc b/system_wrappers/source/aligned_array_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/aligned_array_unittest.cc
rename to system_wrappers/source/aligned_array_unittest.cc
diff --git a/webrtc/system_wrappers/source/aligned_malloc.cc b/system_wrappers/source/aligned_malloc.cc
similarity index 100%
rename from webrtc/system_wrappers/source/aligned_malloc.cc
rename to system_wrappers/source/aligned_malloc.cc
diff --git a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc b/system_wrappers/source/aligned_malloc_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/aligned_malloc_unittest.cc
rename to system_wrappers/source/aligned_malloc_unittest.cc
diff --git a/webrtc/system_wrappers/source/atomic32_darwin.cc b/system_wrappers/source/atomic32_darwin.cc
similarity index 100%
rename from webrtc/system_wrappers/source/atomic32_darwin.cc
rename to system_wrappers/source/atomic32_darwin.cc
diff --git a/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc b/system_wrappers/source/atomic32_non_darwin_unix.cc
similarity index 100%
rename from webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc
rename to system_wrappers/source/atomic32_non_darwin_unix.cc
diff --git a/webrtc/system_wrappers/source/atomic32_win.cc b/system_wrappers/source/atomic32_win.cc
similarity index 100%
rename from webrtc/system_wrappers/source/atomic32_win.cc
rename to system_wrappers/source/atomic32_win.cc
diff --git a/webrtc/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc
similarity index 100%
rename from webrtc/system_wrappers/source/clock.cc
rename to system_wrappers/source/clock.cc
diff --git a/webrtc/system_wrappers/source/clock_unittest.cc b/system_wrappers/source/clock_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/clock_unittest.cc
rename to system_wrappers/source/clock_unittest.cc
diff --git a/webrtc/system_wrappers/source/cpu_features.cc b/system_wrappers/source/cpu_features.cc
similarity index 100%
rename from webrtc/system_wrappers/source/cpu_features.cc
rename to system_wrappers/source/cpu_features.cc
diff --git a/webrtc/system_wrappers/source/cpu_features_android.c b/system_wrappers/source/cpu_features_android.c
similarity index 100%
rename from webrtc/system_wrappers/source/cpu_features_android.c
rename to system_wrappers/source/cpu_features_android.c
diff --git a/webrtc/system_wrappers/source/cpu_features_linux.c b/system_wrappers/source/cpu_features_linux.c
similarity index 100%
rename from webrtc/system_wrappers/source/cpu_features_linux.c
rename to system_wrappers/source/cpu_features_linux.c
diff --git a/webrtc/system_wrappers/source/cpu_info.cc b/system_wrappers/source/cpu_info.cc
similarity index 100%
rename from webrtc/system_wrappers/source/cpu_info.cc
rename to system_wrappers/source/cpu_info.cc
diff --git a/webrtc/system_wrappers/source/event.cc b/system_wrappers/source/event.cc
similarity index 100%
rename from webrtc/system_wrappers/source/event.cc
rename to system_wrappers/source/event.cc
diff --git a/webrtc/system_wrappers/source/event_timer_posix.cc b/system_wrappers/source/event_timer_posix.cc
similarity index 100%
rename from webrtc/system_wrappers/source/event_timer_posix.cc
rename to system_wrappers/source/event_timer_posix.cc
diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/system_wrappers/source/event_timer_posix.h
similarity index 100%
rename from webrtc/system_wrappers/source/event_timer_posix.h
rename to system_wrappers/source/event_timer_posix.h
diff --git a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/event_timer_posix_unittest.cc
rename to system_wrappers/source/event_timer_posix_unittest.cc
diff --git a/webrtc/system_wrappers/source/event_timer_win.cc b/system_wrappers/source/event_timer_win.cc
similarity index 100%
rename from webrtc/system_wrappers/source/event_timer_win.cc
rename to system_wrappers/source/event_timer_win.cc
diff --git a/webrtc/system_wrappers/source/event_timer_win.h b/system_wrappers/source/event_timer_win.h
similarity index 100%
rename from webrtc/system_wrappers/source/event_timer_win.h
rename to system_wrappers/source/event_timer_win.h
diff --git a/webrtc/system_wrappers/source/field_trial_default.cc b/system_wrappers/source/field_trial_default.cc
similarity index 100%
rename from webrtc/system_wrappers/source/field_trial_default.cc
rename to system_wrappers/source/field_trial_default.cc
diff --git a/webrtc/system_wrappers/source/file_impl.cc b/system_wrappers/source/file_impl.cc
similarity index 100%
rename from webrtc/system_wrappers/source/file_impl.cc
rename to system_wrappers/source/file_impl.cc
diff --git a/webrtc/system_wrappers/source/logcat_trace_context.cc b/system_wrappers/source/logcat_trace_context.cc
similarity index 100%
rename from webrtc/system_wrappers/source/logcat_trace_context.cc
rename to system_wrappers/source/logcat_trace_context.cc
diff --git a/webrtc/system_wrappers/source/metrics_default.cc b/system_wrappers/source/metrics_default.cc
similarity index 100%
rename from webrtc/system_wrappers/source/metrics_default.cc
rename to system_wrappers/source/metrics_default.cc
diff --git a/webrtc/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/metrics_default_unittest.cc
rename to system_wrappers/source/metrics_default_unittest.cc
diff --git a/webrtc/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/metrics_unittest.cc
rename to system_wrappers/source/metrics_unittest.cc
diff --git a/webrtc/system_wrappers/source/ntp_time_unittest.cc b/system_wrappers/source/ntp_time_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/ntp_time_unittest.cc
rename to system_wrappers/source/ntp_time_unittest.cc
diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc b/system_wrappers/source/rtp_to_ntp_estimator.cc
similarity index 100%
rename from webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
rename to system_wrappers/source/rtp_to_ntp_estimator.cc
diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc b/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
similarity index 100%
rename from webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
rename to system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
diff --git a/webrtc/system_wrappers/source/rw_lock.cc b/system_wrappers/source/rw_lock.cc
similarity index 100%
rename from webrtc/system_wrappers/source/rw_lock.cc
rename to system_wrappers/source/rw_lock.cc
diff --git a/webrtc/system_wrappers/source/rw_lock_posix.cc b/system_wrappers/source/rw_lock_posix.cc
similarity index 100%
rename from webrtc/system_wrappers/source/rw_lock_posix.cc
rename to system_wrappers/source/rw_lock_posix.cc
diff --git a/webrtc/system_wrappers/source/rw_lock_posix.h b/system_wrappers/source/rw_lock_posix.h
similarity index 100%
rename from webrtc/system_wrappers/source/rw_lock_posix.h
rename to system_wrappers/source/rw_lock_posix.h
diff --git a/webrtc/system_wrappers/source/rw_lock_win.cc b/system_wrappers/source/rw_lock_win.cc
similarity index 100%
rename from webrtc/system_wrappers/source/rw_lock_win.cc
rename to system_wrappers/source/rw_lock_win.cc
diff --git a/webrtc/system_wrappers/source/rw_lock_win.h b/system_wrappers/source/rw_lock_win.h
similarity index 100%
rename from webrtc/system_wrappers/source/rw_lock_win.h
rename to system_wrappers/source/rw_lock_win.h
diff --git a/webrtc/system_wrappers/source/sleep.cc b/system_wrappers/source/sleep.cc
similarity index 100%
rename from webrtc/system_wrappers/source/sleep.cc
rename to system_wrappers/source/sleep.cc
diff --git a/webrtc/system_wrappers/source/timestamp_extrapolator.cc b/system_wrappers/source/timestamp_extrapolator.cc
similarity index 100%
rename from webrtc/system_wrappers/source/timestamp_extrapolator.cc
rename to system_wrappers/source/timestamp_extrapolator.cc
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/system_wrappers/source/trace_impl.cc
similarity index 100%
rename from webrtc/system_wrappers/source/trace_impl.cc
rename to system_wrappers/source/trace_impl.cc
diff --git a/webrtc/system_wrappers/source/trace_impl.h b/system_wrappers/source/trace_impl.h
similarity index 100%
rename from webrtc/system_wrappers/source/trace_impl.h
rename to system_wrappers/source/trace_impl.h
diff --git a/webrtc/system_wrappers/source/trace_posix.cc b/system_wrappers/source/trace_posix.cc
similarity index 100%
rename from webrtc/system_wrappers/source/trace_posix.cc
rename to system_wrappers/source/trace_posix.cc
diff --git a/webrtc/system_wrappers/source/trace_posix.h b/system_wrappers/source/trace_posix.h
similarity index 100%
rename from webrtc/system_wrappers/source/trace_posix.h
rename to system_wrappers/source/trace_posix.h
diff --git a/webrtc/system_wrappers/source/trace_win.cc b/system_wrappers/source/trace_win.cc
similarity index 100%
rename from webrtc/system_wrappers/source/trace_win.cc
rename to system_wrappers/source/trace_win.cc
diff --git a/webrtc/system_wrappers/source/trace_win.h b/system_wrappers/source/trace_win.h
similarity index 100%
rename from webrtc/system_wrappers/source/trace_win.h
rename to system_wrappers/source/trace_win.h
diff --git a/webrtc/test/BUILD.gn b/test/BUILD.gn
similarity index 100%
rename from webrtc/test/BUILD.gn
rename to test/BUILD.gn
diff --git a/webrtc/test/DEPS b/test/DEPS
similarity index 100%
rename from webrtc/test/DEPS
rename to test/DEPS
diff --git a/webrtc/test/OWNERS b/test/OWNERS
similarity index 100%
rename from webrtc/test/OWNERS
rename to test/OWNERS
diff --git a/webrtc/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml
similarity index 100%
rename from webrtc/test/android/AndroidManifest.xml
rename to test/android/AndroidManifest.xml
diff --git a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java b/test/android/org/webrtc/native_test/RTCNativeUnitTest.java
similarity index 100%
rename from webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java
rename to test/android/org/webrtc/native_test/RTCNativeUnitTest.java
diff --git a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java b/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java
similarity index 100%
rename from webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java
rename to test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java
diff --git a/webrtc/test/call_test.cc b/test/call_test.cc
similarity index 100%
rename from webrtc/test/call_test.cc
rename to test/call_test.cc
diff --git a/webrtc/test/call_test.h b/test/call_test.h
similarity index 100%
rename from webrtc/test/call_test.h
rename to test/call_test.h
diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
similarity index 100%
rename from webrtc/test/configurable_frame_size_encoder.cc
rename to test/configurable_frame_size_encoder.cc
diff --git a/webrtc/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
similarity index 100%
rename from webrtc/test/configurable_frame_size_encoder.h
rename to test/configurable_frame_size_encoder.h
diff --git a/webrtc/test/constants.cc b/test/constants.cc
similarity index 100%
rename from webrtc/test/constants.cc
rename to test/constants.cc
diff --git a/webrtc/test/constants.h b/test/constants.h
similarity index 100%
rename from webrtc/test/constants.h
rename to test/constants.h
diff --git a/webrtc/test/direct_transport.cc b/test/direct_transport.cc
similarity index 100%
rename from webrtc/test/direct_transport.cc
rename to test/direct_transport.cc
diff --git a/webrtc/test/direct_transport.h b/test/direct_transport.h
similarity index 100%
rename from webrtc/test/direct_transport.h
rename to test/direct_transport.h
diff --git a/webrtc/test/drifting_clock.cc b/test/drifting_clock.cc
similarity index 100%
rename from webrtc/test/drifting_clock.cc
rename to test/drifting_clock.cc
diff --git a/webrtc/test/drifting_clock.h b/test/drifting_clock.h
similarity index 100%
rename from webrtc/test/drifting_clock.h
rename to test/drifting_clock.h
diff --git a/webrtc/test/encoder_settings.cc b/test/encoder_settings.cc
similarity index 100%
rename from webrtc/test/encoder_settings.cc
rename to test/encoder_settings.cc
diff --git a/webrtc/test/encoder_settings.h b/test/encoder_settings.h
similarity index 100%
rename from webrtc/test/encoder_settings.h
rename to test/encoder_settings.h
diff --git a/webrtc/test/fake_audio_device.cc b/test/fake_audio_device.cc
similarity index 100%
rename from webrtc/test/fake_audio_device.cc
rename to test/fake_audio_device.cc
diff --git a/webrtc/test/fake_audio_device.h b/test/fake_audio_device.h
similarity index 100%
rename from webrtc/test/fake_audio_device.h
rename to test/fake_audio_device.h
diff --git a/webrtc/test/fake_audio_device_unittest.cc b/test/fake_audio_device_unittest.cc
similarity index 100%
rename from webrtc/test/fake_audio_device_unittest.cc
rename to test/fake_audio_device_unittest.cc
diff --git a/webrtc/test/fake_decoder.cc b/test/fake_decoder.cc
similarity index 100%
rename from webrtc/test/fake_decoder.cc
rename to test/fake_decoder.cc
diff --git a/webrtc/test/fake_decoder.h b/test/fake_decoder.h
similarity index 100%
rename from webrtc/test/fake_decoder.h
rename to test/fake_decoder.h
diff --git a/webrtc/test/fake_encoder.cc b/test/fake_encoder.cc
similarity index 100%
rename from webrtc/test/fake_encoder.cc
rename to test/fake_encoder.cc
diff --git a/webrtc/test/fake_encoder.h b/test/fake_encoder.h
similarity index 100%
rename from webrtc/test/fake_encoder.h
rename to test/fake_encoder.h
diff --git a/webrtc/test/fake_network_pipe.cc b/test/fake_network_pipe.cc
similarity index 100%
rename from webrtc/test/fake_network_pipe.cc
rename to test/fake_network_pipe.cc
diff --git a/webrtc/test/fake_network_pipe.h b/test/fake_network_pipe.h
similarity index 100%
rename from webrtc/test/fake_network_pipe.h
rename to test/fake_network_pipe.h
diff --git a/webrtc/test/fake_network_pipe_unittest.cc b/test/fake_network_pipe_unittest.cc
similarity index 100%
rename from webrtc/test/fake_network_pipe_unittest.cc
rename to test/fake_network_pipe_unittest.cc
diff --git a/webrtc/test/fake_texture_frame.cc b/test/fake_texture_frame.cc
similarity index 100%
rename from webrtc/test/fake_texture_frame.cc
rename to test/fake_texture_frame.cc
diff --git a/webrtc/test/fake_texture_frame.h b/test/fake_texture_frame.h
similarity index 100%
rename from webrtc/test/fake_texture_frame.h
rename to test/fake_texture_frame.h
diff --git a/webrtc/test/fake_videorenderer.h b/test/fake_videorenderer.h
similarity index 100%
rename from webrtc/test/fake_videorenderer.h
rename to test/fake_videorenderer.h
diff --git a/webrtc/test/field_trial.cc b/test/field_trial.cc
similarity index 100%
rename from webrtc/test/field_trial.cc
rename to test/field_trial.cc
diff --git a/webrtc/test/field_trial.h b/test/field_trial.h
similarity index 100%
rename from webrtc/test/field_trial.h
rename to test/field_trial.h
diff --git a/webrtc/test/frame_generator.cc b/test/frame_generator.cc
similarity index 100%
rename from webrtc/test/frame_generator.cc
rename to test/frame_generator.cc
diff --git a/webrtc/test/frame_generator.h b/test/frame_generator.h
similarity index 100%
rename from webrtc/test/frame_generator.h
rename to test/frame_generator.h
diff --git a/webrtc/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
similarity index 100%
rename from webrtc/test/frame_generator_capturer.cc
rename to test/frame_generator_capturer.cc
diff --git a/webrtc/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
similarity index 100%
rename from webrtc/test/frame_generator_capturer.h
rename to test/frame_generator_capturer.h
diff --git a/webrtc/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
similarity index 100%
rename from webrtc/test/frame_generator_unittest.cc
rename to test/frame_generator_unittest.cc
diff --git a/webrtc/test/frame_utils.cc b/test/frame_utils.cc
similarity index 100%
rename from webrtc/test/frame_utils.cc
rename to test/frame_utils.cc
diff --git a/webrtc/test/frame_utils.h b/test/frame_utils.h
similarity index 100%
rename from webrtc/test/frame_utils.h
rename to test/frame_utils.h
diff --git a/webrtc/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
similarity index 100%
rename from webrtc/test/fuzzers/BUILD.gn
rename to test/fuzzers/BUILD.gn
diff --git a/webrtc/test/fuzzers/DEPS b/test/fuzzers/DEPS
similarity index 100%
rename from webrtc/test/fuzzers/DEPS
rename to test/fuzzers/DEPS
diff --git a/webrtc/test/fuzzers/OWNERS b/test/fuzzers/OWNERS
similarity index 100%
rename from webrtc/test/fuzzers/OWNERS
rename to test/fuzzers/OWNERS
diff --git a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc b/test/fuzzers/audio_decoder_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_fuzzer.cc
rename to test/fuzzers/audio_decoder_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_fuzzer.h b/test/fuzzers/audio_decoder_fuzzer.h
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_fuzzer.h
rename to test/fuzzers/audio_decoder_fuzzer.h
diff --git a/webrtc/test/fuzzers/audio_decoder_ilbc_fuzzer.cc b/test/fuzzers/audio_decoder_ilbc_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_ilbc_fuzzer.cc
rename to test/fuzzers/audio_decoder_ilbc_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_isac_fuzzer.cc b/test/fuzzers/audio_decoder_isac_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_isac_fuzzer.cc
rename to test/fuzzers/audio_decoder_isac_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc b/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
rename to test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_isacfix_fuzzer.cc b/test/fuzzers/audio_decoder_isacfix_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_isacfix_fuzzer.cc
rename to test/fuzzers/audio_decoder_isacfix_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_opus_fuzzer.cc b/test/fuzzers/audio_decoder_opus_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_opus_fuzzer.cc
rename to test/fuzzers/audio_decoder_opus_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc b/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
rename to test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer.cc b/test/fuzzers/audio_processing_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_processing_fuzzer.cc
rename to test/fuzzers/audio_processing_fuzzer.cc
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer.h b/test/fuzzers/audio_processing_fuzzer.h
similarity index 100%
rename from webrtc/test/fuzzers/audio_processing_fuzzer.h
rename to test/fuzzers/audio_processing_fuzzer.h
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc b/test/fuzzers/audio_processing_fuzzer_configs.cc
similarity index 100%
rename from webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
rename to test/fuzzers/audio_processing_fuzzer_configs.cc
diff --git a/webrtc/test/fuzzers/congestion_controller_feedback_fuzzer.cc b/test/fuzzers/congestion_controller_feedback_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/congestion_controller_feedback_fuzzer.cc
rename to test/fuzzers/congestion_controller_feedback_fuzzer.cc
diff --git a/webrtc/test/fuzzers/corpora/README b/test/fuzzers/corpora/README
similarity index 100%
rename from webrtc/test/fuzzers/corpora/README
rename to test/fuzzers/corpora/README
diff --git a/webrtc/test/fuzzers/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511 b/test/fuzzers/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511
similarity index 100%
rename from webrtc/test/fuzzers/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511
rename to test/fuzzers/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/0.rtcp b/test/fuzzers/corpora/rtcp-corpus/0.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/0.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/0.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/1.rtcp b/test/fuzzers/corpora/rtcp-corpus/1.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/1.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/1.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/10.rtcp b/test/fuzzers/corpora/rtcp-corpus/10.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/10.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/10.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/11.rtcp b/test/fuzzers/corpora/rtcp-corpus/11.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/11.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/11.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/12.rtcp b/test/fuzzers/corpora/rtcp-corpus/12.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/12.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/12.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/13.rtcp b/test/fuzzers/corpora/rtcp-corpus/13.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/13.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/13.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/14.rtcp b/test/fuzzers/corpora/rtcp-corpus/14.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/14.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/14.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/15.rtcp b/test/fuzzers/corpora/rtcp-corpus/15.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/15.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/15.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/16.rtcp b/test/fuzzers/corpora/rtcp-corpus/16.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/16.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/16.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/17.rtcp b/test/fuzzers/corpora/rtcp-corpus/17.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/17.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/17.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/18.rtcp b/test/fuzzers/corpora/rtcp-corpus/18.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/18.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/18.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/19.rtcp b/test/fuzzers/corpora/rtcp-corpus/19.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/19.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/19.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/2.rtcp b/test/fuzzers/corpora/rtcp-corpus/2.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/2.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/2.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/20.rtcp b/test/fuzzers/corpora/rtcp-corpus/20.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/20.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/20.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/21.rtcp b/test/fuzzers/corpora/rtcp-corpus/21.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/21.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/21.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/22.rtcp b/test/fuzzers/corpora/rtcp-corpus/22.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/22.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/22.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/23.rtcp b/test/fuzzers/corpora/rtcp-corpus/23.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/23.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/23.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/24.rtcp b/test/fuzzers/corpora/rtcp-corpus/24.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/24.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/24.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/25.rtcp b/test/fuzzers/corpora/rtcp-corpus/25.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/25.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/25.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/26.rtcp b/test/fuzzers/corpora/rtcp-corpus/26.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/26.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/26.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/27.rtcp b/test/fuzzers/corpora/rtcp-corpus/27.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/27.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/27.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/28.rtcp b/test/fuzzers/corpora/rtcp-corpus/28.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/28.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/28.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/29.rtcp b/test/fuzzers/corpora/rtcp-corpus/29.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/29.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/29.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/3.rtcp b/test/fuzzers/corpora/rtcp-corpus/3.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/3.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/3.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/30.rtcp b/test/fuzzers/corpora/rtcp-corpus/30.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/30.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/30.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/31.rtcp b/test/fuzzers/corpora/rtcp-corpus/31.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/31.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/31.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/32.rtcp b/test/fuzzers/corpora/rtcp-corpus/32.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/32.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/32.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/33.rtcp b/test/fuzzers/corpora/rtcp-corpus/33.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/33.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/33.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/34.rtcp b/test/fuzzers/corpora/rtcp-corpus/34.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/34.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/34.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/35.rtcp b/test/fuzzers/corpora/rtcp-corpus/35.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/35.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/35.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/36.rtcp b/test/fuzzers/corpora/rtcp-corpus/36.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/36.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/36.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/37.rtcp b/test/fuzzers/corpora/rtcp-corpus/37.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/37.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/37.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/38.rtcp b/test/fuzzers/corpora/rtcp-corpus/38.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/38.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/38.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/39.rtcp b/test/fuzzers/corpora/rtcp-corpus/39.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/39.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/39.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/4.rtcp b/test/fuzzers/corpora/rtcp-corpus/4.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/4.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/4.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/40.rtcp b/test/fuzzers/corpora/rtcp-corpus/40.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/40.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/40.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/41.rtcp b/test/fuzzers/corpora/rtcp-corpus/41.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/41.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/41.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/42.rtcp b/test/fuzzers/corpora/rtcp-corpus/42.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/42.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/42.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/43.rtcp b/test/fuzzers/corpora/rtcp-corpus/43.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/43.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/43.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/44.rtcp b/test/fuzzers/corpora/rtcp-corpus/44.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/44.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/44.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/45.rtcp b/test/fuzzers/corpora/rtcp-corpus/45.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/45.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/45.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/46.rtcp b/test/fuzzers/corpora/rtcp-corpus/46.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/46.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/46.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/47.rtcp b/test/fuzzers/corpora/rtcp-corpus/47.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/47.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/47.rtcp
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/48.rtcp b/test/fuzzers/corpora/rtcp-corpus/48.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/48.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/48.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/49.rtcp b/test/fuzzers/corpora/rtcp-corpus/49.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/49.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/49.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/5.rtcp b/test/fuzzers/corpora/rtcp-corpus/5.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/5.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/5.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/50.rtcp b/test/fuzzers/corpora/rtcp-corpus/50.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/50.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/50.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/51.rtcp b/test/fuzzers/corpora/rtcp-corpus/51.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/51.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/51.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/52.rtcp b/test/fuzzers/corpora/rtcp-corpus/52.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/52.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/52.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/53.rtcp b/test/fuzzers/corpora/rtcp-corpus/53.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/53.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/53.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/54.rtcp b/test/fuzzers/corpora/rtcp-corpus/54.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/54.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/54.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/55.rtcp b/test/fuzzers/corpora/rtcp-corpus/55.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/55.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/55.rtcp
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/56.rtcp b/test/fuzzers/corpora/rtcp-corpus/56.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/56.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/56.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/57.rtcp b/test/fuzzers/corpora/rtcp-corpus/57.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/57.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/57.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/58.rtcp b/test/fuzzers/corpora/rtcp-corpus/58.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/58.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/58.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/59.rtcp b/test/fuzzers/corpora/rtcp-corpus/59.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/59.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/59.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/6.rtcp b/test/fuzzers/corpora/rtcp-corpus/6.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/6.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/6.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/60.rtcp b/test/fuzzers/corpora/rtcp-corpus/60.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/60.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/60.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/61.rtcp b/test/fuzzers/corpora/rtcp-corpus/61.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/61.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/61.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/62.rtcp b/test/fuzzers/corpora/rtcp-corpus/62.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/62.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/62.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/63.rtcp b/test/fuzzers/corpora/rtcp-corpus/63.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/63.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/63.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/64.rtcp b/test/fuzzers/corpora/rtcp-corpus/64.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/64.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/64.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/65.rtcp b/test/fuzzers/corpora/rtcp-corpus/65.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/65.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/65.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/66.rtcp b/test/fuzzers/corpora/rtcp-corpus/66.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/66.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/66.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/7.rtcp b/test/fuzzers/corpora/rtcp-corpus/7.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/7.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/7.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/8.rtcp b/test/fuzzers/corpora/rtcp-corpus/8.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/8.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/8.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtcp-corpus/9.rtcp b/test/fuzzers/corpora/rtcp-corpus/9.rtcp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtcp-corpus/9.rtcp
rename to test/fuzzers/corpora/rtcp-corpus/9.rtcp
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-0 b/test/fuzzers/corpora/rtp-corpus/rtp-0
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtp-corpus/rtp-0
rename to test/fuzzers/corpora/rtp-corpus/rtp-0
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-1 b/test/fuzzers/corpora/rtp-corpus/rtp-1
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtp-corpus/rtp-1
rename to test/fuzzers/corpora/rtp-corpus/rtp-1
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-2 b/test/fuzzers/corpora/rtp-corpus/rtp-2
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtp-corpus/rtp-2
rename to test/fuzzers/corpora/rtp-corpus/rtp-2
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-3 b/test/fuzzers/corpora/rtp-corpus/rtp-3
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtp-corpus/rtp-3
rename to test/fuzzers/corpora/rtp-corpus/rtp-3
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/rtp-corpus/rtp-4 b/test/fuzzers/corpora/rtp-corpus/rtp-4
similarity index 100%
rename from webrtc/test/fuzzers/corpora/rtp-corpus/rtp-4
rename to test/fuzzers/corpora/rtp-corpus/rtp-4
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/10.sdp b/test/fuzzers/corpora/sdp-corpus/10.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/10.sdp
rename to test/fuzzers/corpora/sdp-corpus/10.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/11.sdp b/test/fuzzers/corpora/sdp-corpus/11.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/11.sdp
rename to test/fuzzers/corpora/sdp-corpus/11.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/12.sdp b/test/fuzzers/corpora/sdp-corpus/12.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/12.sdp
rename to test/fuzzers/corpora/sdp-corpus/12.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/13.sdp b/test/fuzzers/corpora/sdp-corpus/13.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/13.sdp
rename to test/fuzzers/corpora/sdp-corpus/13.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/14.sdp b/test/fuzzers/corpora/sdp-corpus/14.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/14.sdp
rename to test/fuzzers/corpora/sdp-corpus/14.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/15.sdp b/test/fuzzers/corpora/sdp-corpus/15.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/15.sdp
rename to test/fuzzers/corpora/sdp-corpus/15.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/16.sdp b/test/fuzzers/corpora/sdp-corpus/16.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/16.sdp
rename to test/fuzzers/corpora/sdp-corpus/16.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/17.sdp b/test/fuzzers/corpora/sdp-corpus/17.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/17.sdp
rename to test/fuzzers/corpora/sdp-corpus/17.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/18.sdp b/test/fuzzers/corpora/sdp-corpus/18.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/18.sdp
rename to test/fuzzers/corpora/sdp-corpus/18.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/19.sdp b/test/fuzzers/corpora/sdp-corpus/19.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/19.sdp
rename to test/fuzzers/corpora/sdp-corpus/19.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/2.sdp b/test/fuzzers/corpora/sdp-corpus/2.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/2.sdp
rename to test/fuzzers/corpora/sdp-corpus/2.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/20.sdp b/test/fuzzers/corpora/sdp-corpus/20.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/20.sdp
rename to test/fuzzers/corpora/sdp-corpus/20.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/21.sdp b/test/fuzzers/corpora/sdp-corpus/21.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/21.sdp
rename to test/fuzzers/corpora/sdp-corpus/21.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/22.sdp b/test/fuzzers/corpora/sdp-corpus/22.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/22.sdp
rename to test/fuzzers/corpora/sdp-corpus/22.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/23.sdp b/test/fuzzers/corpora/sdp-corpus/23.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/23.sdp
rename to test/fuzzers/corpora/sdp-corpus/23.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/24.sdp b/test/fuzzers/corpora/sdp-corpus/24.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/24.sdp
rename to test/fuzzers/corpora/sdp-corpus/24.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/25.sdp b/test/fuzzers/corpora/sdp-corpus/25.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/25.sdp
rename to test/fuzzers/corpora/sdp-corpus/25.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/26.sdp b/test/fuzzers/corpora/sdp-corpus/26.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/26.sdp
rename to test/fuzzers/corpora/sdp-corpus/26.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/27.sdp b/test/fuzzers/corpora/sdp-corpus/27.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/27.sdp
rename to test/fuzzers/corpora/sdp-corpus/27.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/28.sdp b/test/fuzzers/corpora/sdp-corpus/28.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/28.sdp
rename to test/fuzzers/corpora/sdp-corpus/28.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/29.sdp b/test/fuzzers/corpora/sdp-corpus/29.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/29.sdp
rename to test/fuzzers/corpora/sdp-corpus/29.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/3.sdp b/test/fuzzers/corpora/sdp-corpus/3.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/3.sdp
rename to test/fuzzers/corpora/sdp-corpus/3.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/30.sdp b/test/fuzzers/corpora/sdp-corpus/30.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/30.sdp
rename to test/fuzzers/corpora/sdp-corpus/30.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/31.sdp b/test/fuzzers/corpora/sdp-corpus/31.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/31.sdp
rename to test/fuzzers/corpora/sdp-corpus/31.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/32.sdp b/test/fuzzers/corpora/sdp-corpus/32.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/32.sdp
rename to test/fuzzers/corpora/sdp-corpus/32.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/33.sdp b/test/fuzzers/corpora/sdp-corpus/33.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/33.sdp
rename to test/fuzzers/corpora/sdp-corpus/33.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/34.sdp b/test/fuzzers/corpora/sdp-corpus/34.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/34.sdp
rename to test/fuzzers/corpora/sdp-corpus/34.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/35.sdp b/test/fuzzers/corpora/sdp-corpus/35.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/35.sdp
rename to test/fuzzers/corpora/sdp-corpus/35.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/36.sdp b/test/fuzzers/corpora/sdp-corpus/36.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/36.sdp
rename to test/fuzzers/corpora/sdp-corpus/36.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/37.sdp b/test/fuzzers/corpora/sdp-corpus/37.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/37.sdp
rename to test/fuzzers/corpora/sdp-corpus/37.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/38.sdp b/test/fuzzers/corpora/sdp-corpus/38.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/38.sdp
rename to test/fuzzers/corpora/sdp-corpus/38.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/39.sdp b/test/fuzzers/corpora/sdp-corpus/39.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/39.sdp
rename to test/fuzzers/corpora/sdp-corpus/39.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/4.sdp b/test/fuzzers/corpora/sdp-corpus/4.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/4.sdp
rename to test/fuzzers/corpora/sdp-corpus/4.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/40.sdp b/test/fuzzers/corpora/sdp-corpus/40.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/40.sdp
rename to test/fuzzers/corpora/sdp-corpus/40.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/41.sdp b/test/fuzzers/corpora/sdp-corpus/41.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/41.sdp
rename to test/fuzzers/corpora/sdp-corpus/41.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/42.sdp b/test/fuzzers/corpora/sdp-corpus/42.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/42.sdp
rename to test/fuzzers/corpora/sdp-corpus/42.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/43.sdp b/test/fuzzers/corpora/sdp-corpus/43.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/43.sdp
rename to test/fuzzers/corpora/sdp-corpus/43.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/44.sdp b/test/fuzzers/corpora/sdp-corpus/44.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/44.sdp
rename to test/fuzzers/corpora/sdp-corpus/44.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/45.sdp b/test/fuzzers/corpora/sdp-corpus/45.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/45.sdp
rename to test/fuzzers/corpora/sdp-corpus/45.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/46.sdp b/test/fuzzers/corpora/sdp-corpus/46.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/46.sdp
rename to test/fuzzers/corpora/sdp-corpus/46.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/47.sdp b/test/fuzzers/corpora/sdp-corpus/47.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/47.sdp
rename to test/fuzzers/corpora/sdp-corpus/47.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/48.sdp b/test/fuzzers/corpora/sdp-corpus/48.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/48.sdp
rename to test/fuzzers/corpora/sdp-corpus/48.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/49.sdp b/test/fuzzers/corpora/sdp-corpus/49.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/49.sdp
rename to test/fuzzers/corpora/sdp-corpus/49.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/5.sdp b/test/fuzzers/corpora/sdp-corpus/5.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/5.sdp
rename to test/fuzzers/corpora/sdp-corpus/5.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/50.sdp b/test/fuzzers/corpora/sdp-corpus/50.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/50.sdp
rename to test/fuzzers/corpora/sdp-corpus/50.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/51.sdp b/test/fuzzers/corpora/sdp-corpus/51.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/51.sdp
rename to test/fuzzers/corpora/sdp-corpus/51.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/52.sdp b/test/fuzzers/corpora/sdp-corpus/52.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/52.sdp
rename to test/fuzzers/corpora/sdp-corpus/52.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/53.sdp b/test/fuzzers/corpora/sdp-corpus/53.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/53.sdp
rename to test/fuzzers/corpora/sdp-corpus/53.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/54.sdp b/test/fuzzers/corpora/sdp-corpus/54.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/54.sdp
rename to test/fuzzers/corpora/sdp-corpus/54.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/55.sdp b/test/fuzzers/corpora/sdp-corpus/55.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/55.sdp
rename to test/fuzzers/corpora/sdp-corpus/55.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/6.sdp b/test/fuzzers/corpora/sdp-corpus/6.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/6.sdp
rename to test/fuzzers/corpora/sdp-corpus/6.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/7.sdp b/test/fuzzers/corpora/sdp-corpus/7.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/7.sdp
rename to test/fuzzers/corpora/sdp-corpus/7.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/8.sdp b/test/fuzzers/corpora/sdp-corpus/8.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/8.sdp
rename to test/fuzzers/corpora/sdp-corpus/8.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/9.sdp b/test/fuzzers/corpora/sdp-corpus/9.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/9.sdp
rename to test/fuzzers/corpora/sdp-corpus/9.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/firefox-1.sdp b/test/fuzzers/corpora/sdp-corpus/firefox-1.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/firefox-1.sdp
rename to test/fuzzers/corpora/sdp-corpus/firefox-1.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/firefox-2.sdp b/test/fuzzers/corpora/sdp-corpus/firefox-2.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/firefox-2.sdp
rename to test/fuzzers/corpora/sdp-corpus/firefox-2.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/opera-1.sdp b/test/fuzzers/corpora/sdp-corpus/opera-1.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/opera-1.sdp
rename to test/fuzzers/corpora/sdp-corpus/opera-1.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/opera-2.sdp b/test/fuzzers/corpora/sdp-corpus/opera-2.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/opera-2.sdp
rename to test/fuzzers/corpora/sdp-corpus/opera-2.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-1.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-1.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-1.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-1.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-2.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-2.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-2.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-2.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-3.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-3.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-3.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-3.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-4.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-4.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-4.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-4.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-5.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-5.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-5.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-5.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-6.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-6.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-6.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-6.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-7.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-7.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-7.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-7.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-8.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-8.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-8.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-8.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp-corpus/unittest-9.sdp b/test/fuzzers/corpora/sdp-corpus/unittest-9.sdp
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp-corpus/unittest-9.sdp
rename to test/fuzzers/corpora/sdp-corpus/unittest-9.sdp
diff --git a/webrtc/test/fuzzers/corpora/sdp.tokens b/test/fuzzers/corpora/sdp.tokens
similarity index 100%
rename from webrtc/test/fuzzers/corpora/sdp.tokens
rename to test/fuzzers/corpora/sdp.tokens
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/0.stun b/test/fuzzers/corpora/stun-corpus/0.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/0.stun
rename to test/fuzzers/corpora/stun-corpus/0.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/1.stun b/test/fuzzers/corpora/stun-corpus/1.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/1.stun
rename to test/fuzzers/corpora/stun-corpus/1.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/10.stun b/test/fuzzers/corpora/stun-corpus/10.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/10.stun
rename to test/fuzzers/corpora/stun-corpus/10.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/11.stun b/test/fuzzers/corpora/stun-corpus/11.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/11.stun
rename to test/fuzzers/corpora/stun-corpus/11.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/12.stun b/test/fuzzers/corpora/stun-corpus/12.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/12.stun
rename to test/fuzzers/corpora/stun-corpus/12.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/13.stun b/test/fuzzers/corpora/stun-corpus/13.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/13.stun
rename to test/fuzzers/corpora/stun-corpus/13.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/14.stun b/test/fuzzers/corpora/stun-corpus/14.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/14.stun
rename to test/fuzzers/corpora/stun-corpus/14.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/15.stun b/test/fuzzers/corpora/stun-corpus/15.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/15.stun
rename to test/fuzzers/corpora/stun-corpus/15.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/16.stun b/test/fuzzers/corpora/stun-corpus/16.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/16.stun
rename to test/fuzzers/corpora/stun-corpus/16.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/17.stun b/test/fuzzers/corpora/stun-corpus/17.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/17.stun
rename to test/fuzzers/corpora/stun-corpus/17.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/2.stun b/test/fuzzers/corpora/stun-corpus/2.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/2.stun
rename to test/fuzzers/corpora/stun-corpus/2.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/3.stun b/test/fuzzers/corpora/stun-corpus/3.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/3.stun
rename to test/fuzzers/corpora/stun-corpus/3.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/4.stun b/test/fuzzers/corpora/stun-corpus/4.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/4.stun
rename to test/fuzzers/corpora/stun-corpus/4.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/5.stun b/test/fuzzers/corpora/stun-corpus/5.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/5.stun
rename to test/fuzzers/corpora/stun-corpus/5.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/6.stun b/test/fuzzers/corpora/stun-corpus/6.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/6.stun
rename to test/fuzzers/corpora/stun-corpus/6.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/7.stun b/test/fuzzers/corpora/stun-corpus/7.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/7.stun
rename to test/fuzzers/corpora/stun-corpus/7.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/8.stun b/test/fuzzers/corpora/stun-corpus/8.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/8.stun
rename to test/fuzzers/corpora/stun-corpus/8.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/9.stun b/test/fuzzers/corpora/stun-corpus/9.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/9.stun
rename to test/fuzzers/corpora/stun-corpus/9.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun-corpus/validator-crash-1.stun b/test/fuzzers/corpora/stun-corpus/validator-crash-1.stun
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun-corpus/validator-crash-1.stun
rename to test/fuzzers/corpora/stun-corpus/validator-crash-1.stun
Binary files differ
diff --git a/webrtc/test/fuzzers/corpora/stun.tokens b/test/fuzzers/corpora/stun.tokens
similarity index 100%
rename from webrtc/test/fuzzers/corpora/stun.tokens
rename to test/fuzzers/corpora/stun.tokens
diff --git a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc b/test/fuzzers/flexfec_header_reader_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
rename to test/fuzzers/flexfec_header_reader_fuzzer.cc
diff --git a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc b/test/fuzzers/flexfec_receiver_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
rename to test/fuzzers/flexfec_receiver_fuzzer.cc
diff --git a/webrtc/test/fuzzers/flexfec_sender_fuzzer.cc b/test/fuzzers/flexfec_sender_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/flexfec_sender_fuzzer.cc
rename to test/fuzzers/flexfec_sender_fuzzer.cc
diff --git a/webrtc/test/fuzzers/h264_bitstream_parser_fuzzer.cc b/test/fuzzers/h264_bitstream_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/h264_bitstream_parser_fuzzer.cc
rename to test/fuzzers/h264_bitstream_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/h264_depacketizer_fuzzer.cc b/test/fuzzers/h264_depacketizer_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/h264_depacketizer_fuzzer.cc
rename to test/fuzzers/h264_depacketizer_fuzzer.cc
diff --git a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc b/test/fuzzers/neteq_rtp_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
rename to test/fuzzers/neteq_rtp_fuzzer.cc
diff --git a/webrtc/test/fuzzers/packet_buffer_fuzzer.cc b/test/fuzzers/packet_buffer_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/packet_buffer_fuzzer.cc
rename to test/fuzzers/packet_buffer_fuzzer.cc
diff --git a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc b/test/fuzzers/pseudotcp_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
rename to test/fuzzers/pseudotcp_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc b/test/fuzzers/residual_echo_detector_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
rename to test/fuzzers/residual_echo_detector_fuzzer.cc
diff --git a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc b/test/fuzzers/rtcp_receiver_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
rename to test/fuzzers/rtcp_receiver_fuzzer.cc
diff --git a/webrtc/test/fuzzers/rtp_header_fuzzer.cc b/test/fuzzers/rtp_header_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/rtp_header_fuzzer.cc
rename to test/fuzzers/rtp_header_fuzzer.cc
diff --git a/webrtc/test/fuzzers/rtp_packet_fuzzer.cc b/test/fuzzers/rtp_packet_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/rtp_packet_fuzzer.cc
rename to test/fuzzers/rtp_packet_fuzzer.cc
diff --git a/webrtc/test/fuzzers/sdp_parser_fuzzer.cc b/test/fuzzers/sdp_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/sdp_parser_fuzzer.cc
rename to test/fuzzers/sdp_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/stun_parser_fuzzer.cc b/test/fuzzers/stun_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/stun_parser_fuzzer.cc
rename to test/fuzzers/stun_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/stun_validator_fuzzer.cc b/test/fuzzers/stun_validator_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/stun_validator_fuzzer.cc
rename to test/fuzzers/stun_validator_fuzzer.cc
diff --git a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
rename to test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
diff --git a/webrtc/test/fuzzers/turn_unwrap_fuzzer.cc b/test/fuzzers/turn_unwrap_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/turn_unwrap_fuzzer.cc
rename to test/fuzzers/turn_unwrap_fuzzer.cc
diff --git a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc b/test/fuzzers/ulpfec_generator_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
rename to test/fuzzers/ulpfec_generator_fuzzer.cc
diff --git a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/test/fuzzers/ulpfec_header_reader_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
rename to test/fuzzers/ulpfec_header_reader_fuzzer.cc
diff --git a/webrtc/test/fuzzers/vp8_depacketizer_fuzzer.cc b/test/fuzzers/vp8_depacketizer_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/vp8_depacketizer_fuzzer.cc
rename to test/fuzzers/vp8_depacketizer_fuzzer.cc
diff --git a/webrtc/test/fuzzers/vp8_qp_parser_fuzzer.cc b/test/fuzzers/vp8_qp_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/vp8_qp_parser_fuzzer.cc
rename to test/fuzzers/vp8_qp_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/vp9_depacketizer_fuzzer.cc b/test/fuzzers/vp9_depacketizer_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/vp9_depacketizer_fuzzer.cc
rename to test/fuzzers/vp9_depacketizer_fuzzer.cc
diff --git a/webrtc/test/fuzzers/vp9_qp_parser_fuzzer.cc b/test/fuzzers/vp9_qp_parser_fuzzer.cc
similarity index 100%
rename from webrtc/test/fuzzers/vp9_qp_parser_fuzzer.cc
rename to test/fuzzers/vp9_qp_parser_fuzzer.cc
diff --git a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc b/test/fuzzers/webrtc_fuzzer_main.cc
similarity index 100%
rename from webrtc/test/fuzzers/webrtc_fuzzer_main.cc
rename to test/fuzzers/webrtc_fuzzer_main.cc
diff --git a/webrtc/test/gl/gl_renderer.cc b/test/gl/gl_renderer.cc
similarity index 100%
rename from webrtc/test/gl/gl_renderer.cc
rename to test/gl/gl_renderer.cc
diff --git a/webrtc/test/gl/gl_renderer.h b/test/gl/gl_renderer.h
similarity index 100%
rename from webrtc/test/gl/gl_renderer.h
rename to test/gl/gl_renderer.h
diff --git a/webrtc/test/gmock.h b/test/gmock.h
similarity index 100%
rename from webrtc/test/gmock.h
rename to test/gmock.h
diff --git a/webrtc/test/gtest.h b/test/gtest.h
similarity index 100%
rename from webrtc/test/gtest.h
rename to test/gtest.h
diff --git a/webrtc/test/ios/Info.plist b/test/ios/Info.plist
similarity index 100%
rename from webrtc/test/ios/Info.plist
rename to test/ios/Info.plist
diff --git a/webrtc/test/ios/test_support.h b/test/ios/test_support.h
similarity index 100%
rename from webrtc/test/ios/test_support.h
rename to test/ios/test_support.h
diff --git a/webrtc/test/ios/test_support.mm b/test/ios/test_support.mm
similarity index 100%
rename from webrtc/test/ios/test_support.mm
rename to test/ios/test_support.mm
diff --git a/webrtc/test/layer_filtering_transport.cc b/test/layer_filtering_transport.cc
similarity index 100%
rename from webrtc/test/layer_filtering_transport.cc
rename to test/layer_filtering_transport.cc
diff --git a/webrtc/test/layer_filtering_transport.h b/test/layer_filtering_transport.h
similarity index 100%
rename from webrtc/test/layer_filtering_transport.h
rename to test/layer_filtering_transport.h
diff --git a/webrtc/test/linux/glx_renderer.cc b/test/linux/glx_renderer.cc
similarity index 100%
rename from webrtc/test/linux/glx_renderer.cc
rename to test/linux/glx_renderer.cc
diff --git a/webrtc/test/linux/glx_renderer.h b/test/linux/glx_renderer.h
similarity index 100%
rename from webrtc/test/linux/glx_renderer.h
rename to test/linux/glx_renderer.h
diff --git a/webrtc/test/linux/video_renderer_linux.cc b/test/linux/video_renderer_linux.cc
similarity index 100%
rename from webrtc/test/linux/video_renderer_linux.cc
rename to test/linux/video_renderer_linux.cc
diff --git a/webrtc/test/mac/run_test.mm b/test/mac/run_test.mm
similarity index 100%
rename from webrtc/test/mac/run_test.mm
rename to test/mac/run_test.mm
diff --git a/webrtc/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h
similarity index 100%
rename from webrtc/test/mac/video_renderer_mac.h
rename to test/mac/video_renderer_mac.h
diff --git a/webrtc/test/mac/video_renderer_mac.mm b/test/mac/video_renderer_mac.mm
similarity index 100%
rename from webrtc/test/mac/video_renderer_mac.mm
rename to test/mac/video_renderer_mac.mm
diff --git a/webrtc/test/mock_audio_decoder.cc b/test/mock_audio_decoder.cc
similarity index 100%
rename from webrtc/test/mock_audio_decoder.cc
rename to test/mock_audio_decoder.cc
diff --git a/webrtc/test/mock_audio_decoder.h b/test/mock_audio_decoder.h
similarity index 100%
rename from webrtc/test/mock_audio_decoder.h
rename to test/mock_audio_decoder.h
diff --git a/webrtc/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h
similarity index 100%
rename from webrtc/test/mock_audio_decoder_factory.h
rename to test/mock_audio_decoder_factory.h
diff --git a/webrtc/test/mock_audio_encoder.cc b/test/mock_audio_encoder.cc
similarity index 100%
rename from webrtc/test/mock_audio_encoder.cc
rename to test/mock_audio_encoder.cc
diff --git a/webrtc/test/mock_audio_encoder.h b/test/mock_audio_encoder.h
similarity index 100%
rename from webrtc/test/mock_audio_encoder.h
rename to test/mock_audio_encoder.h
diff --git a/webrtc/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h
similarity index 100%
rename from webrtc/test/mock_audio_encoder_factory.h
rename to test/mock_audio_encoder_factory.h
diff --git a/webrtc/test/mock_transport.h b/test/mock_transport.h
similarity index 100%
rename from webrtc/test/mock_transport.h
rename to test/mock_transport.h
diff --git a/webrtc/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h
similarity index 100%
rename from webrtc/test/mock_voe_channel_proxy.h
rename to test/mock_voe_channel_proxy.h
diff --git a/webrtc/test/mock_voice_engine.h b/test/mock_voice_engine.h
similarity index 100%
rename from webrtc/test/mock_voice_engine.h
rename to test/mock_voice_engine.h
diff --git a/webrtc/test/null_platform_renderer.cc b/test/null_platform_renderer.cc
similarity index 100%
rename from webrtc/test/null_platform_renderer.cc
rename to test/null_platform_renderer.cc
diff --git a/webrtc/test/null_transport.cc b/test/null_transport.cc
similarity index 100%
rename from webrtc/test/null_transport.cc
rename to test/null_transport.cc
diff --git a/webrtc/test/null_transport.h b/test/null_transport.h
similarity index 100%
rename from webrtc/test/null_transport.h
rename to test/null_transport.h
diff --git a/webrtc/test/rtcp_packet_parser.cc b/test/rtcp_packet_parser.cc
similarity index 100%
rename from webrtc/test/rtcp_packet_parser.cc
rename to test/rtcp_packet_parser.cc
diff --git a/webrtc/test/rtcp_packet_parser.h b/test/rtcp_packet_parser.h
similarity index 100%
rename from webrtc/test/rtcp_packet_parser.h
rename to test/rtcp_packet_parser.h
diff --git a/webrtc/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
similarity index 100%
rename from webrtc/test/rtp_file_reader.cc
rename to test/rtp_file_reader.cc
diff --git a/webrtc/test/rtp_file_reader.h b/test/rtp_file_reader.h
similarity index 100%
rename from webrtc/test/rtp_file_reader.h
rename to test/rtp_file_reader.h
diff --git a/webrtc/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
similarity index 100%
rename from webrtc/test/rtp_file_reader_unittest.cc
rename to test/rtp_file_reader_unittest.cc
diff --git a/webrtc/test/rtp_file_writer.cc b/test/rtp_file_writer.cc
similarity index 100%
rename from webrtc/test/rtp_file_writer.cc
rename to test/rtp_file_writer.cc
diff --git a/webrtc/test/rtp_file_writer.h b/test/rtp_file_writer.h
similarity index 100%
rename from webrtc/test/rtp_file_writer.h
rename to test/rtp_file_writer.h
diff --git a/webrtc/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc
similarity index 100%
rename from webrtc/test/rtp_file_writer_unittest.cc
rename to test/rtp_file_writer_unittest.cc
diff --git a/webrtc/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
similarity index 100%
rename from webrtc/test/rtp_rtcp_observer.h
rename to test/rtp_rtcp_observer.h
diff --git a/webrtc/test/run_loop.cc b/test/run_loop.cc
similarity index 100%
rename from webrtc/test/run_loop.cc
rename to test/run_loop.cc
diff --git a/webrtc/test/run_loop.h b/test/run_loop.h
similarity index 100%
rename from webrtc/test/run_loop.h
rename to test/run_loop.h
diff --git a/webrtc/test/run_test.cc b/test/run_test.cc
similarity index 100%
rename from webrtc/test/run_test.cc
rename to test/run_test.cc
diff --git a/webrtc/test/run_test.h b/test/run_test.h
similarity index 100%
rename from webrtc/test/run_test.h
rename to test/run_test.h
diff --git a/webrtc/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc
similarity index 100%
rename from webrtc/test/single_threaded_task_queue.cc
rename to test/single_threaded_task_queue.cc
diff --git a/webrtc/test/single_threaded_task_queue.h b/test/single_threaded_task_queue.h
similarity index 100%
rename from webrtc/test/single_threaded_task_queue.h
rename to test/single_threaded_task_queue.h
diff --git a/webrtc/test/single_threaded_task_queue_unittest.cc b/test/single_threaded_task_queue_unittest.cc
similarity index 100%
rename from webrtc/test/single_threaded_task_queue_unittest.cc
rename to test/single_threaded_task_queue_unittest.cc
diff --git a/webrtc/test/statistics.cc b/test/statistics.cc
similarity index 100%
rename from webrtc/test/statistics.cc
rename to test/statistics.cc
diff --git a/webrtc/test/statistics.h b/test/statistics.h
similarity index 100%
rename from webrtc/test/statistics.h
rename to test/statistics.h
diff --git a/webrtc/test/test_main.cc b/test/test_main.cc
similarity index 100%
rename from webrtc/test/test_main.cc
rename to test/test_main.cc
diff --git a/webrtc/test/testsupport/always_passing_unittest.cc b/test/testsupport/always_passing_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/always_passing_unittest.cc
rename to test/testsupport/always_passing_unittest.cc
diff --git a/webrtc/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc
similarity index 100%
rename from webrtc/test/testsupport/fileutils.cc
rename to test/testsupport/fileutils.cc
diff --git a/webrtc/test/testsupport/fileutils.h b/test/testsupport/fileutils.h
similarity index 100%
rename from webrtc/test/testsupport/fileutils.h
rename to test/testsupport/fileutils.h
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/test/testsupport/fileutils_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/fileutils_unittest.cc
rename to test/testsupport/fileutils_unittest.cc
diff --git a/webrtc/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h
similarity index 100%
rename from webrtc/test/testsupport/frame_reader.h
rename to test/testsupport/frame_reader.h
diff --git a/webrtc/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h
similarity index 100%
rename from webrtc/test/testsupport/frame_writer.h
rename to test/testsupport/frame_writer.h
diff --git a/webrtc/test/testsupport/iosfileutils.mm b/test/testsupport/iosfileutils.mm
similarity index 100%
rename from webrtc/test/testsupport/iosfileutils.mm
rename to test/testsupport/iosfileutils.mm
diff --git a/webrtc/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc
similarity index 100%
rename from webrtc/test/testsupport/jpeg_frame_writer.cc
rename to test/testsupport/jpeg_frame_writer.cc
diff --git a/webrtc/test/testsupport/jpeg_frame_writer_ios.cc b/test/testsupport/jpeg_frame_writer_ios.cc
similarity index 100%
rename from webrtc/test/testsupport/jpeg_frame_writer_ios.cc
rename to test/testsupport/jpeg_frame_writer_ios.cc
diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/test/testsupport/metrics/video_metrics.cc
similarity index 100%
rename from webrtc/test/testsupport/metrics/video_metrics.cc
rename to test/testsupport/metrics/video_metrics.cc
diff --git a/webrtc/test/testsupport/metrics/video_metrics.h b/test/testsupport/metrics/video_metrics.h
similarity index 100%
rename from webrtc/test/testsupport/metrics/video_metrics.h
rename to test/testsupport/metrics/video_metrics.h
diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/metrics/video_metrics_unittest.cc
rename to test/testsupport/metrics/video_metrics_unittest.cc
diff --git a/webrtc/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h
similarity index 100%
rename from webrtc/test/testsupport/mock/mock_frame_reader.h
rename to test/testsupport/mock/mock_frame_reader.h
diff --git a/webrtc/test/testsupport/mock/mock_frame_writer.h b/test/testsupport/mock/mock_frame_writer.h
similarity index 100%
rename from webrtc/test/testsupport/mock/mock_frame_writer.h
rename to test/testsupport/mock/mock_frame_writer.h
diff --git a/webrtc/test/testsupport/packet_reader.cc b/test/testsupport/packet_reader.cc
similarity index 100%
rename from webrtc/test/testsupport/packet_reader.cc
rename to test/testsupport/packet_reader.cc
diff --git a/webrtc/test/testsupport/packet_reader.h b/test/testsupport/packet_reader.h
similarity index 100%
rename from webrtc/test/testsupport/packet_reader.h
rename to test/testsupport/packet_reader.h
diff --git a/webrtc/test/testsupport/packet_reader_unittest.cc b/test/testsupport/packet_reader_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/packet_reader_unittest.cc
rename to test/testsupport/packet_reader_unittest.cc
diff --git a/webrtc/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
similarity index 100%
rename from webrtc/test/testsupport/perf_test.cc
rename to test/testsupport/perf_test.cc
diff --git a/webrtc/test/testsupport/perf_test.h b/test/testsupport/perf_test.h
similarity index 100%
rename from webrtc/test/testsupport/perf_test.h
rename to test/testsupport/perf_test.h
diff --git a/webrtc/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/perf_test_unittest.cc
rename to test/testsupport/perf_test_unittest.cc
diff --git a/webrtc/test/testsupport/test_output.cc b/test/testsupport/test_output.cc
similarity index 100%
rename from webrtc/test/testsupport/test_output.cc
rename to test/testsupport/test_output.cc
diff --git a/webrtc/test/testsupport/test_output.h b/test/testsupport/test_output.h
similarity index 100%
rename from webrtc/test/testsupport/test_output.h
rename to test/testsupport/test_output.h
diff --git a/webrtc/test/testsupport/test_output_unittest.cc b/test/testsupport/test_output_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/test_output_unittest.cc
rename to test/testsupport/test_output_unittest.cc
diff --git a/webrtc/test/testsupport/trace_to_stderr.cc b/test/testsupport/trace_to_stderr.cc
similarity index 100%
rename from webrtc/test/testsupport/trace_to_stderr.cc
rename to test/testsupport/trace_to_stderr.cc
diff --git a/webrtc/test/testsupport/trace_to_stderr.h b/test/testsupport/trace_to_stderr.h
similarity index 100%
rename from webrtc/test/testsupport/trace_to_stderr.h
rename to test/testsupport/trace_to_stderr.h
diff --git a/webrtc/test/testsupport/unittest_utils.h b/test/testsupport/unittest_utils.h
similarity index 100%
rename from webrtc/test/testsupport/unittest_utils.h
rename to test/testsupport/unittest_utils.h
diff --git a/webrtc/test/testsupport/y4m_frame_writer.cc b/test/testsupport/y4m_frame_writer.cc
similarity index 100%
rename from webrtc/test/testsupport/y4m_frame_writer.cc
rename to test/testsupport/y4m_frame_writer.cc
diff --git a/webrtc/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/y4m_frame_writer_unittest.cc
rename to test/testsupport/y4m_frame_writer_unittest.cc
diff --git a/webrtc/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc
similarity index 100%
rename from webrtc/test/testsupport/yuv_frame_reader.cc
rename to test/testsupport/yuv_frame_reader.cc
diff --git a/webrtc/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/yuv_frame_reader_unittest.cc
rename to test/testsupport/yuv_frame_reader_unittest.cc
diff --git a/webrtc/test/testsupport/yuv_frame_writer.cc b/test/testsupport/yuv_frame_writer.cc
similarity index 100%
rename from webrtc/test/testsupport/yuv_frame_writer.cc
rename to test/testsupport/yuv_frame_writer.cc
diff --git a/webrtc/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc
similarity index 100%
rename from webrtc/test/testsupport/yuv_frame_writer_unittest.cc
rename to test/testsupport/yuv_frame_writer_unittest.cc
diff --git a/webrtc/test/vcm_capturer.cc b/test/vcm_capturer.cc
similarity index 100%
rename from webrtc/test/vcm_capturer.cc
rename to test/vcm_capturer.cc
diff --git a/webrtc/test/vcm_capturer.h b/test/vcm_capturer.h
similarity index 100%
rename from webrtc/test/vcm_capturer.h
rename to test/vcm_capturer.h
diff --git a/webrtc/test/video_capturer.cc b/test/video_capturer.cc
similarity index 100%
rename from webrtc/test/video_capturer.cc
rename to test/video_capturer.cc
diff --git a/webrtc/test/video_capturer.h b/test/video_capturer.h
similarity index 100%
rename from webrtc/test/video_capturer.h
rename to test/video_capturer.h
diff --git a/webrtc/test/video_codec_settings.h b/test/video_codec_settings.h
similarity index 100%
rename from webrtc/test/video_codec_settings.h
rename to test/video_codec_settings.h
diff --git a/webrtc/test/video_renderer.cc b/test/video_renderer.cc
similarity index 100%
rename from webrtc/test/video_renderer.cc
rename to test/video_renderer.cc
diff --git a/webrtc/test/video_renderer.h b/test/video_renderer.h
similarity index 100%
rename from webrtc/test/video_renderer.h
rename to test/video_renderer.h
diff --git a/webrtc/test/win/d3d_renderer.cc b/test/win/d3d_renderer.cc
similarity index 100%
rename from webrtc/test/win/d3d_renderer.cc
rename to test/win/d3d_renderer.cc
diff --git a/webrtc/test/win/d3d_renderer.h b/test/win/d3d_renderer.h
similarity index 100%
rename from webrtc/test/win/d3d_renderer.h
rename to test/win/d3d_renderer.h
diff --git a/webrtc/test/win/run_loop_win.cc b/test/win/run_loop_win.cc
similarity index 100%
rename from webrtc/test/win/run_loop_win.cc
rename to test/win/run_loop_win.cc
diff --git a/webrtc/typedefs.h b/typedefs.h
similarity index 100%
rename from webrtc/typedefs.h
rename to typedefs.h
diff --git a/webrtc/video/BUILD.gn b/video/BUILD.gn
similarity index 100%
rename from webrtc/video/BUILD.gn
rename to video/BUILD.gn
diff --git a/webrtc/video/DEPS b/video/DEPS
similarity index 100%
rename from webrtc/video/DEPS
rename to video/DEPS
diff --git a/webrtc/video/OWNERS b/video/OWNERS
similarity index 100%
rename from webrtc/video/OWNERS
rename to video/OWNERS
diff --git a/webrtc/video/call_stats.cc b/video/call_stats.cc
similarity index 100%
rename from webrtc/video/call_stats.cc
rename to video/call_stats.cc
diff --git a/webrtc/video/call_stats.h b/video/call_stats.h
similarity index 100%
rename from webrtc/video/call_stats.h
rename to video/call_stats.h
diff --git a/webrtc/video/call_stats_unittest.cc b/video/call_stats_unittest.cc
similarity index 100%
rename from webrtc/video/call_stats_unittest.cc
rename to video/call_stats_unittest.cc
diff --git a/webrtc/video/encoder_rtcp_feedback.cc b/video/encoder_rtcp_feedback.cc
similarity index 100%
rename from webrtc/video/encoder_rtcp_feedback.cc
rename to video/encoder_rtcp_feedback.cc
diff --git a/webrtc/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h
similarity index 100%
rename from webrtc/video/encoder_rtcp_feedback.h
rename to video/encoder_rtcp_feedback.h
diff --git a/webrtc/video/encoder_rtcp_feedback_unittest.cc b/video/encoder_rtcp_feedback_unittest.cc
similarity index 100%
rename from webrtc/video/encoder_rtcp_feedback_unittest.cc
rename to video/encoder_rtcp_feedback_unittest.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
similarity index 100%
rename from webrtc/video/end_to_end_tests.cc
rename to video/end_to_end_tests.cc
diff --git a/webrtc/video/full_stack_tests.cc b/video/full_stack_tests.cc
similarity index 100%
rename from webrtc/video/full_stack_tests.cc
rename to video/full_stack_tests.cc
diff --git a/webrtc/video/full_stack_tests_plot.py b/video/full_stack_tests_plot.py
similarity index 100%
rename from webrtc/video/full_stack_tests_plot.py
rename to video/full_stack_tests_plot.py
diff --git a/webrtc/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc
similarity index 100%
rename from webrtc/video/overuse_frame_detector.cc
rename to video/overuse_frame_detector.cc
diff --git a/webrtc/video/overuse_frame_detector.h b/video/overuse_frame_detector.h
similarity index 100%
rename from webrtc/video/overuse_frame_detector.h
rename to video/overuse_frame_detector.h
diff --git a/webrtc/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
similarity index 100%
rename from webrtc/video/overuse_frame_detector_unittest.cc
rename to video/overuse_frame_detector_unittest.cc
diff --git a/webrtc/video/payload_router.cc b/video/payload_router.cc
similarity index 100%
rename from webrtc/video/payload_router.cc
rename to video/payload_router.cc
diff --git a/webrtc/video/payload_router.h b/video/payload_router.h
similarity index 100%
rename from webrtc/video/payload_router.h
rename to video/payload_router.h
diff --git a/webrtc/video/payload_router_unittest.cc b/video/payload_router_unittest.cc
similarity index 100%
rename from webrtc/video/payload_router_unittest.cc
rename to video/payload_router_unittest.cc
diff --git a/webrtc/video/picture_id_tests.cc b/video/picture_id_tests.cc
similarity index 100%
rename from webrtc/video/picture_id_tests.cc
rename to video/picture_id_tests.cc
diff --git a/webrtc/video/quality_threshold.cc b/video/quality_threshold.cc
similarity index 100%
rename from webrtc/video/quality_threshold.cc
rename to video/quality_threshold.cc
diff --git a/webrtc/video/quality_threshold.h b/video/quality_threshold.h
similarity index 100%
rename from webrtc/video/quality_threshold.h
rename to video/quality_threshold.h
diff --git a/webrtc/video/quality_threshold_unittest.cc b/video/quality_threshold_unittest.cc
similarity index 100%
rename from webrtc/video/quality_threshold_unittest.cc
rename to video/quality_threshold_unittest.cc
diff --git a/webrtc/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc
similarity index 100%
rename from webrtc/video/receive_statistics_proxy.cc
rename to video/receive_statistics_proxy.cc
diff --git a/webrtc/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h
similarity index 100%
rename from webrtc/video/receive_statistics_proxy.h
rename to video/receive_statistics_proxy.h
diff --git a/webrtc/video/receive_statistics_proxy_unittest.cc b/video/receive_statistics_proxy_unittest.cc
similarity index 100%
rename from webrtc/video/receive_statistics_proxy_unittest.cc
rename to video/receive_statistics_proxy_unittest.cc
diff --git a/webrtc/video/replay.cc b/video/replay.cc
similarity index 100%
rename from webrtc/video/replay.cc
rename to video/replay.cc
diff --git a/webrtc/video/report_block_stats.cc b/video/report_block_stats.cc
similarity index 100%
rename from webrtc/video/report_block_stats.cc
rename to video/report_block_stats.cc
diff --git a/webrtc/video/report_block_stats.h b/video/report_block_stats.h
similarity index 100%
rename from webrtc/video/report_block_stats.h
rename to video/report_block_stats.h
diff --git a/webrtc/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc
similarity index 100%
rename from webrtc/video/report_block_stats_unittest.cc
rename to video/report_block_stats_unittest.cc
diff --git a/webrtc/video/rtp_streams_synchronizer.cc b/video/rtp_streams_synchronizer.cc
similarity index 100%
rename from webrtc/video/rtp_streams_synchronizer.cc
rename to video/rtp_streams_synchronizer.cc
diff --git a/webrtc/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h
similarity index 100%
rename from webrtc/video/rtp_streams_synchronizer.h
rename to video/rtp_streams_synchronizer.h
diff --git a/webrtc/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc
similarity index 100%
rename from webrtc/video/rtp_video_stream_receiver.cc
rename to video/rtp_video_stream_receiver.cc
diff --git a/webrtc/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
similarity index 100%
rename from webrtc/video/rtp_video_stream_receiver.h
rename to video/rtp_video_stream_receiver.h
diff --git a/webrtc/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
similarity index 100%
rename from webrtc/video/rtp_video_stream_receiver_unittest.cc
rename to video/rtp_video_stream_receiver_unittest.cc
diff --git a/webrtc/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
similarity index 100%
rename from webrtc/video/screenshare_loopback.cc
rename to video/screenshare_loopback.cc
diff --git a/webrtc/video/send_delay_stats.cc b/video/send_delay_stats.cc
similarity index 100%
rename from webrtc/video/send_delay_stats.cc
rename to video/send_delay_stats.cc
diff --git a/webrtc/video/send_delay_stats.h b/video/send_delay_stats.h
similarity index 100%
rename from webrtc/video/send_delay_stats.h
rename to video/send_delay_stats.h
diff --git a/webrtc/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc
similarity index 100%
rename from webrtc/video/send_delay_stats_unittest.cc
rename to video/send_delay_stats_unittest.cc
diff --git a/webrtc/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
similarity index 100%
rename from webrtc/video/send_statistics_proxy.cc
rename to video/send_statistics_proxy.cc
diff --git a/webrtc/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
similarity index 100%
rename from webrtc/video/send_statistics_proxy.h
rename to video/send_statistics_proxy.h
diff --git a/webrtc/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
similarity index 100%
rename from webrtc/video/send_statistics_proxy_unittest.cc
rename to video/send_statistics_proxy_unittest.cc
diff --git a/webrtc/video/stats_counter.cc b/video/stats_counter.cc
similarity index 100%
rename from webrtc/video/stats_counter.cc
rename to video/stats_counter.cc
diff --git a/webrtc/video/stats_counter.h b/video/stats_counter.h
similarity index 100%
rename from webrtc/video/stats_counter.h
rename to video/stats_counter.h
diff --git a/webrtc/video/stats_counter_unittest.cc b/video/stats_counter_unittest.cc
similarity index 100%
rename from webrtc/video/stats_counter_unittest.cc
rename to video/stats_counter_unittest.cc
diff --git a/webrtc/video/stream_synchronization.cc b/video/stream_synchronization.cc
similarity index 100%
rename from webrtc/video/stream_synchronization.cc
rename to video/stream_synchronization.cc
diff --git a/webrtc/video/stream_synchronization.h b/video/stream_synchronization.h
similarity index 100%
rename from webrtc/video/stream_synchronization.h
rename to video/stream_synchronization.h
diff --git a/webrtc/video/stream_synchronization_unittest.cc b/video/stream_synchronization_unittest.cc
similarity index 100%
rename from webrtc/video/stream_synchronization_unittest.cc
rename to video/stream_synchronization_unittest.cc
diff --git a/webrtc/video/transport_adapter.cc b/video/transport_adapter.cc
similarity index 100%
rename from webrtc/video/transport_adapter.cc
rename to video/transport_adapter.cc
diff --git a/webrtc/video/transport_adapter.h b/video/transport_adapter.h
similarity index 100%
rename from webrtc/video/transport_adapter.h
rename to video/transport_adapter.h
diff --git a/webrtc/video/video_loopback.cc b/video/video_loopback.cc
similarity index 100%
rename from webrtc/video/video_loopback.cc
rename to video/video_loopback.cc
diff --git a/webrtc/video/video_quality_test.cc b/video/video_quality_test.cc
similarity index 100%
rename from webrtc/video/video_quality_test.cc
rename to video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.h b/video/video_quality_test.h
similarity index 100%
rename from webrtc/video/video_quality_test.h
rename to video/video_quality_test.h
diff --git a/webrtc/video/video_receive_stream.cc b/video/video_receive_stream.cc
similarity index 100%
rename from webrtc/video/video_receive_stream.cc
rename to video/video_receive_stream.cc
diff --git a/webrtc/video/video_receive_stream.h b/video/video_receive_stream.h
similarity index 100%
rename from webrtc/video/video_receive_stream.h
rename to video/video_receive_stream.h
diff --git a/webrtc/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc
similarity index 100%
rename from webrtc/video/video_receive_stream_unittest.cc
rename to video/video_receive_stream_unittest.cc
diff --git a/webrtc/video/video_send_stream.cc b/video/video_send_stream.cc
similarity index 100%
rename from webrtc/video/video_send_stream.cc
rename to video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.h b/video/video_send_stream.h
similarity index 100%
rename from webrtc/video/video_send_stream.h
rename to video/video_send_stream.h
diff --git a/webrtc/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
similarity index 100%
rename from webrtc/video/video_send_stream_tests.cc
rename to video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_stream_decoder.cc b/video/video_stream_decoder.cc
similarity index 100%
rename from webrtc/video/video_stream_decoder.cc
rename to video/video_stream_decoder.cc
diff --git a/webrtc/video/video_stream_decoder.h b/video/video_stream_decoder.h
similarity index 100%
rename from webrtc/video/video_stream_decoder.h
rename to video/video_stream_decoder.h
diff --git a/webrtc/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
similarity index 100%
rename from webrtc/video/video_stream_encoder.cc
rename to video/video_stream_encoder.cc
diff --git a/webrtc/video/video_stream_encoder.h b/video/video_stream_encoder.h
similarity index 100%
rename from webrtc/video/video_stream_encoder.h
rename to video/video_stream_encoder.h
diff --git a/webrtc/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
similarity index 100%
rename from webrtc/video/video_stream_encoder_unittest.cc
rename to video/video_stream_encoder_unittest.cc
diff --git a/webrtc/voice_engine/BUILD.gn b/voice_engine/BUILD.gn
similarity index 100%
rename from webrtc/voice_engine/BUILD.gn
rename to voice_engine/BUILD.gn
diff --git a/webrtc/voice_engine/DEPS b/voice_engine/DEPS
similarity index 100%
rename from webrtc/voice_engine/DEPS
rename to voice_engine/DEPS
diff --git a/webrtc/voice_engine/OWNERS b/voice_engine/OWNERS
similarity index 100%
rename from webrtc/voice_engine/OWNERS
rename to voice_engine/OWNERS
diff --git a/webrtc/voice_engine/audio_level.cc b/voice_engine/audio_level.cc
similarity index 100%
rename from webrtc/voice_engine/audio_level.cc
rename to voice_engine/audio_level.cc
diff --git a/webrtc/voice_engine/audio_level.h b/voice_engine/audio_level.h
similarity index 100%
rename from webrtc/voice_engine/audio_level.h
rename to voice_engine/audio_level.h
diff --git a/webrtc/voice_engine/channel.cc b/voice_engine/channel.cc
similarity index 100%
rename from webrtc/voice_engine/channel.cc
rename to voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.h b/voice_engine/channel.h
similarity index 100%
rename from webrtc/voice_engine/channel.h
rename to voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel_manager.cc b/voice_engine/channel_manager.cc
similarity index 100%
rename from webrtc/voice_engine/channel_manager.cc
rename to voice_engine/channel_manager.cc
diff --git a/webrtc/voice_engine/channel_manager.h b/voice_engine/channel_manager.h
similarity index 100%
rename from webrtc/voice_engine/channel_manager.h
rename to voice_engine/channel_manager.h
diff --git a/webrtc/voice_engine/channel_proxy.cc b/voice_engine/channel_proxy.cc
similarity index 100%
rename from webrtc/voice_engine/channel_proxy.cc
rename to voice_engine/channel_proxy.cc
diff --git a/webrtc/voice_engine/channel_proxy.h b/voice_engine/channel_proxy.h
similarity index 100%
rename from webrtc/voice_engine/channel_proxy.h
rename to voice_engine/channel_proxy.h
diff --git a/webrtc/voice_engine/channel_unittest.cc b/voice_engine/channel_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/channel_unittest.cc
rename to voice_engine/channel_unittest.cc
diff --git a/webrtc/voice_engine/coder.cc b/voice_engine/coder.cc
similarity index 100%
rename from webrtc/voice_engine/coder.cc
rename to voice_engine/coder.cc
diff --git a/webrtc/voice_engine/coder.h b/voice_engine/coder.h
similarity index 100%
rename from webrtc/voice_engine/coder.h
rename to voice_engine/coder.h
diff --git a/webrtc/voice_engine/file_player.cc b/voice_engine/file_player.cc
similarity index 100%
rename from webrtc/voice_engine/file_player.cc
rename to voice_engine/file_player.cc
diff --git a/webrtc/voice_engine/file_player.h b/voice_engine/file_player.h
similarity index 100%
rename from webrtc/voice_engine/file_player.h
rename to voice_engine/file_player.h
diff --git a/webrtc/voice_engine/file_player_unittests.cc b/voice_engine/file_player_unittests.cc
similarity index 100%
rename from webrtc/voice_engine/file_player_unittests.cc
rename to voice_engine/file_player_unittests.cc
diff --git a/webrtc/voice_engine/file_recorder.cc b/voice_engine/file_recorder.cc
similarity index 100%
rename from webrtc/voice_engine/file_recorder.cc
rename to voice_engine/file_recorder.cc
diff --git a/webrtc/voice_engine/file_recorder.h b/voice_engine/file_recorder.h
similarity index 100%
rename from webrtc/voice_engine/file_recorder.h
rename to voice_engine/file_recorder.h
diff --git a/webrtc/voice_engine/include/voe_base.h b/voice_engine/include/voe_base.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_base.h
rename to voice_engine/include/voe_base.h
diff --git a/webrtc/voice_engine/include/voe_codec.h b/voice_engine/include/voe_codec.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_codec.h
rename to voice_engine/include/voe_codec.h
diff --git a/webrtc/voice_engine/include/voe_errors.h b/voice_engine/include/voe_errors.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_errors.h
rename to voice_engine/include/voe_errors.h
diff --git a/webrtc/voice_engine/include/voe_file.h b/voice_engine/include/voe_file.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_file.h
rename to voice_engine/include/voe_file.h
diff --git a/webrtc/voice_engine/include/voe_network.h b/voice_engine/include/voe_network.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_network.h
rename to voice_engine/include/voe_network.h
diff --git a/webrtc/voice_engine/include/voe_rtp_rtcp.h b/voice_engine/include/voe_rtp_rtcp.h
similarity index 100%
rename from webrtc/voice_engine/include/voe_rtp_rtcp.h
rename to voice_engine/include/voe_rtp_rtcp.h
diff --git a/webrtc/voice_engine/mock/mock_voe_observer.h b/voice_engine/mock/mock_voe_observer.h
similarity index 100%
rename from webrtc/voice_engine/mock/mock_voe_observer.h
rename to voice_engine/mock/mock_voe_observer.h
diff --git a/webrtc/voice_engine/monitor_module.h b/voice_engine/monitor_module.h
similarity index 100%
rename from webrtc/voice_engine/monitor_module.h
rename to voice_engine/monitor_module.h
diff --git a/webrtc/voice_engine/output_mixer.cc b/voice_engine/output_mixer.cc
similarity index 100%
rename from webrtc/voice_engine/output_mixer.cc
rename to voice_engine/output_mixer.cc
diff --git a/webrtc/voice_engine/output_mixer.h b/voice_engine/output_mixer.h
similarity index 100%
rename from webrtc/voice_engine/output_mixer.h
rename to voice_engine/output_mixer.h
diff --git a/webrtc/voice_engine/shared_data.cc b/voice_engine/shared_data.cc
similarity index 100%
rename from webrtc/voice_engine/shared_data.cc
rename to voice_engine/shared_data.cc
diff --git a/webrtc/voice_engine/shared_data.h b/voice_engine/shared_data.h
similarity index 100%
rename from webrtc/voice_engine/shared_data.h
rename to voice_engine/shared_data.h
diff --git a/webrtc/voice_engine/statistics.cc b/voice_engine/statistics.cc
similarity index 100%
rename from webrtc/voice_engine/statistics.cc
rename to voice_engine/statistics.cc
diff --git a/webrtc/voice_engine/statistics.h b/voice_engine/statistics.h
similarity index 100%
rename from webrtc/voice_engine/statistics.h
rename to voice_engine/statistics.h
diff --git a/webrtc/voice_engine/test/auto_test/automated_mode.cc b/voice_engine/test/auto_test/automated_mode.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/automated_mode.cc
rename to voice_engine/test/auto_test/automated_mode.cc
diff --git a/webrtc/voice_engine/test/auto_test/automated_mode.h b/voice_engine/test/auto_test/automated_mode.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/automated_mode.h
rename to voice_engine/test/auto_test/automated_mode.h
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
rename to voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
rename to voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
rename to voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
rename to voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
rename to voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
rename to voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc
rename to voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h
rename to voice_engine/test/auto_test/fixtures/before_streaming_fixture.h
diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc b/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc
rename to voice_engine/test/auto_test/standard/codec_before_streaming_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc b/voice_engine/test/auto_test/standard/codec_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/codec_test.cc
rename to voice_engine/test/auto_test/standard/codec_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc b/voice_engine/test/auto_test/standard/dtmf_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc
rename to voice_engine/test/auto_test/standard/dtmf_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
rename to voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
rename to voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
rename to voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc b/voice_engine/test/auto_test/voe_standard_test.cc
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/voe_standard_test.cc
rename to voice_engine/test/auto_test/voe_standard_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/voe_standard_test.h
rename to voice_engine/test/auto_test/voe_standard_test.h
diff --git a/webrtc/voice_engine/test/auto_test/voe_test_common.h b/voice_engine/test/auto_test/voe_test_common.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/voe_test_common.h
rename to voice_engine/test/auto_test/voe_test_common.h
diff --git a/webrtc/voice_engine/test/auto_test/voe_test_defines.h b/voice_engine/test/auto_test/voe_test_defines.h
similarity index 100%
rename from webrtc/voice_engine/test/auto_test/voe_test_defines.h
rename to voice_engine/test/auto_test/voe_test_defines.h
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc
similarity index 100%
rename from webrtc/voice_engine/transmit_mixer.cc
rename to voice_engine/transmit_mixer.cc
diff --git a/webrtc/voice_engine/transmit_mixer.h b/voice_engine/transmit_mixer.h
similarity index 100%
rename from webrtc/voice_engine/transmit_mixer.h
rename to voice_engine/transmit_mixer.h
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc b/voice_engine/transport_feedback_packet_loss_tracker.cc
similarity index 100%
rename from webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
rename to voice_engine/transport_feedback_packet_loss_tracker.cc
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h b/voice_engine/transport_feedback_packet_loss_tracker.h
similarity index 100%
rename from webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
rename to voice_engine/transport_feedback_packet_loss_tracker.h
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
rename to voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
diff --git a/webrtc/voice_engine/utility.cc b/voice_engine/utility.cc
similarity index 100%
rename from webrtc/voice_engine/utility.cc
rename to voice_engine/utility.cc
diff --git a/webrtc/voice_engine/utility.h b/voice_engine/utility.h
similarity index 100%
rename from webrtc/voice_engine/utility.h
rename to voice_engine/utility.h
diff --git a/webrtc/voice_engine/utility_unittest.cc b/voice_engine/utility_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/utility_unittest.cc
rename to voice_engine/utility_unittest.cc
diff --git a/webrtc/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voe_base_impl.cc
rename to voice_engine/voe_base_impl.cc
diff --git a/webrtc/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h
similarity index 100%
rename from webrtc/voice_engine/voe_base_impl.h
rename to voice_engine/voe_base_impl.h
diff --git a/webrtc/voice_engine/voe_base_unittest.cc b/voice_engine/voe_base_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/voe_base_unittest.cc
rename to voice_engine/voe_base_unittest.cc
diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/voice_engine/voe_codec_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voe_codec_impl.cc
rename to voice_engine/voe_codec_impl.cc
diff --git a/webrtc/voice_engine/voe_codec_impl.h b/voice_engine/voe_codec_impl.h
similarity index 100%
rename from webrtc/voice_engine/voe_codec_impl.h
rename to voice_engine/voe_codec_impl.h
diff --git a/webrtc/voice_engine/voe_codec_unittest.cc b/voice_engine/voe_codec_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/voe_codec_unittest.cc
rename to voice_engine/voe_codec_unittest.cc
diff --git a/webrtc/voice_engine/voe_file_impl.cc b/voice_engine/voe_file_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voe_file_impl.cc
rename to voice_engine/voe_file_impl.cc
diff --git a/webrtc/voice_engine/voe_file_impl.h b/voice_engine/voe_file_impl.h
similarity index 100%
rename from webrtc/voice_engine/voe_file_impl.h
rename to voice_engine/voe_file_impl.h
diff --git a/webrtc/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voe_network_impl.cc
rename to voice_engine/voe_network_impl.cc
diff --git a/webrtc/voice_engine/voe_network_impl.h b/voice_engine/voe_network_impl.h
similarity index 100%
rename from webrtc/voice_engine/voe_network_impl.h
rename to voice_engine/voe_network_impl.h
diff --git a/webrtc/voice_engine/voe_network_unittest.cc b/voice_engine/voe_network_unittest.cc
similarity index 100%
rename from webrtc/voice_engine/voe_network_unittest.cc
rename to voice_engine/voe_network_unittest.cc
diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/voice_engine/voe_rtp_rtcp_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voe_rtp_rtcp_impl.cc
rename to voice_engine/voe_rtp_rtcp_impl.cc
diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.h b/voice_engine/voe_rtp_rtcp_impl.h
similarity index 100%
rename from webrtc/voice_engine/voe_rtp_rtcp_impl.h
rename to voice_engine/voe_rtp_rtcp_impl.h
diff --git a/webrtc/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h
similarity index 100%
rename from webrtc/voice_engine/voice_engine_defines.h
rename to voice_engine/voice_engine_defines.h
diff --git a/webrtc/voice_engine/voice_engine_fixture.cc b/voice_engine/voice_engine_fixture.cc
similarity index 100%
rename from webrtc/voice_engine/voice_engine_fixture.cc
rename to voice_engine/voice_engine_fixture.cc
diff --git a/webrtc/voice_engine/voice_engine_fixture.h b/voice_engine/voice_engine_fixture.h
similarity index 100%
rename from webrtc/voice_engine/voice_engine_fixture.h
rename to voice_engine/voice_engine_fixture.h
diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc
similarity index 100%
rename from webrtc/voice_engine/voice_engine_impl.cc
rename to voice_engine/voice_engine_impl.cc
diff --git a/webrtc/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h
similarity index 100%
rename from webrtc/voice_engine/voice_engine_impl.h
rename to voice_engine/voice_engine_impl.h
diff --git a/webrtc/webrtc.gni b/webrtc.gni
similarity index 100%
rename from webrtc/webrtc.gni
rename to webrtc.gni
diff --git a/webrtc/.gitignore b/webrtc/.gitignore
deleted file mode 100644
index b5abe8e..0000000
--- a/webrtc/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is for projects that checkout webrtc/ directly (e.g. Chromium). It
-# is a truncated copy of the .gitignore file in the parent directory.
-*.DS_Store
-*.Makefile
-*.host.mk
-*.ncb
-*.ninja
-*.props
-*.pyc
-*.rules
-*.scons
-*.sdf
-*.sln
-*.suo
-*.target.mk
-*.targets
-*.user
-*.vcproj
-*.vcxproj
-*.vcxproj.filters
-*.vpj
-*.vpw
-*.vpwhistu
-*.vtg
-*.xcodeproj
-*_proto.xml
-*_proto_cpp.xml
-*~
-.*.sw?
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
deleted file mode 100644
index bfdb53b..0000000
--- a/webrtc/BUILD.gn
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-# TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
-
-import("//build/config/linux/pkg_config.gni")
-import("//build/config/sanitizers/sanitizers.gni")
-import("webrtc.gni")
-import("//third_party/protobuf/proto_library.gni")
-if (is_android) {
- import("//build/config/android/config.gni")
- import("//build/config/android/rules.gni")
-}
-
-# Contains the defines and includes in common.gypi that are duplicated both as
-# target_defaults and direct_dependent_settings.
-config("common_inherited_config") {
- defines = []
- cflags = []
- ldflags = []
- if (build_with_mozilla) {
- defines += [ "WEBRTC_MOZILLA_BUILD" ]
- }
-
- # Some tests need to declare their own trace event handlers. If this define is
- # not set, the first time TRACE_EVENT_* is called it will store the return
- # value for the current handler in an static variable, so that subsequent
- # changes to the handler for that TRACE_EVENT_* will be ignored.
- # So when tests are included, we set this define, making it possible to use
- # different event handlers in different tests.
- if (rtc_include_tests) {
- defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1" ]
- } else {
- defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
- }
- if (build_with_chromium) {
- defines += [
- # TODO(kjellander): Cleanup unused ones and move defines closer to
- # the source when webrtc:4256 is completed.
- "FEATURE_ENABLE_VOICEMAIL",
- "GTEST_RELATIVE_PATH",
- "WEBRTC_CHROMIUM_BUILD",
- ]
- include_dirs = [
- # The overrides must be included first as that is the mechanism for
- # selecting the override headers in Chromium.
- "../webrtc_overrides",
-
- # Allow includes to be prefixed with webrtc/ in case it is not an
- # immediate subdirectory of the top-level.
- "..",
- ]
- }
- if (is_posix) {
- defines += [ "WEBRTC_POSIX" ]
- }
- if (is_ios) {
- defines += [
- "WEBRTC_MAC",
- "WEBRTC_IOS",
- ]
- }
- if (is_linux) {
- defines += [ "WEBRTC_LINUX" ]
- }
- if (is_mac) {
- defines += [ "WEBRTC_MAC" ]
- }
- if (is_win) {
- defines += [
- "WEBRTC_WIN",
- "_CRT_SECURE_NO_WARNINGS", # Suppress warnings about _vsnprinf
- ]
- }
- if (is_android) {
- defines += [
- "WEBRTC_LINUX",
- "WEBRTC_ANDROID",
- ]
- }
- if (is_chromeos) {
- defines += [ "CHROMEOS" ]
- }
-
- if (rtc_sanitize_coverage != "") {
- assert(is_clang, "sanitizer coverage requires clang")
- cflags += [ "-fsanitize-coverage=${rtc_sanitize_coverage}" ]
- ldflags += [ "-fsanitize-coverage=${rtc_sanitize_coverage}" ]
- }
-
- if (is_ubsan) {
- cflags += [ "-fsanitize=float-cast-overflow" ]
- }
-
- # TODO(GYP): Support these in GN.
- # if (is_bsd) {
- # defines += [ "BSD" ]
- # }
- # if (is_openbsd) {
- # defines += [ "OPENBSD" ]
- # }
- # if (is_freebsd) {
- # defines += [ "FREEBSD" ]
- # }
-}
-
-config("common_config") {
- cflags = []
- cflags_cc = []
- defines = []
-
- if (rtc_enable_protobuf) {
- defines += [ "WEBRTC_ENABLE_PROTOBUF=1" ]
- } else {
- defines += [ "WEBRTC_ENABLE_PROTOBUF=0" ]
- }
-
- if (rtc_restrict_logging) {
- defines += [ "WEBRTC_RESTRICT_LOGGING" ]
- }
-
- if (rtc_include_internal_audio_device) {
- defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ]
- }
-
- if (!rtc_libvpx_build_vp9) {
- defines += [ "RTC_DISABLE_VP9" ]
- }
-
- if (rtc_enable_sctp) {
- defines += [ "HAVE_SCTP" ]
- }
-
- if (rtc_enable_external_auth) {
- defines += [ "ENABLE_EXTERNAL_AUTH" ]
- }
-
- if (build_with_chromium) {
- defines += [
- # NOTICE: Since common_inherited_config is used in public_configs for our
- # targets, there's no point including the defines in that config here.
- # TODO(kjellander): Cleanup unused ones and move defines closer to the
- # source when webrtc:4256 is completed.
- "HAVE_WEBRTC_VIDEO",
- "HAVE_WEBRTC_VOICE",
- "LOGGING_INSIDE_WEBRTC",
- "USE_WEBRTC_DEV_BRANCH",
- ]
- } else {
- if (is_posix) {
- # Enable more warnings: -Wextra is currently disabled in Chromium.
- cflags = [
- "-Wextra",
-
- # Repeat some flags that get overridden by -Wextra.
- "-Wno-unused-parameter",
- "-Wno-missing-field-initializers",
- "-Wno-strict-overflow",
- ]
- cflags_cc = [
- "-Wnon-virtual-dtor",
-
- # This is enabled for clang; enable for gcc as well.
- "-Woverloaded-virtual",
- ]
- }
-
- if (is_clang) {
- cflags += [
- "-Wc++11-narrowing",
- "-Wimplicit-fallthrough",
- "-Wthread-safety",
- "-Winconsistent-missing-override",
- "-Wundef",
- ]
-
- # use_xcode_clang only refers to the iOS toolchain, host binaries use
- # chromium's clang always.
- if (!is_nacl &&
- (!use_xcode_clang || current_toolchain == host_toolchain)) {
- # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
- # recognize.
- cflags += [ "-Wunused-lambda-capture" ]
- }
- }
- }
-
- if (current_cpu == "arm64") {
- defines += [ "WEBRTC_ARCH_ARM64" ]
- defines += [ "WEBRTC_HAS_NEON" ]
- }
-
- if (current_cpu == "arm") {
- defines += [ "WEBRTC_ARCH_ARM" ]
- if (arm_version >= 7) {
- defines += [ "WEBRTC_ARCH_ARM_V7" ]
- if (arm_use_neon) {
- defines += [ "WEBRTC_HAS_NEON" ]
- }
- }
- }
-
- if (current_cpu == "mipsel") {
- defines += [ "MIPS32_LE" ]
- if (mips_float_abi == "hard") {
- defines += [ "MIPS_FPU_LE" ]
- }
- if (mips_arch_variant == "r2") {
- defines += [ "MIPS32_R2_LE" ]
- }
- if (mips_dsp_rev == 1) {
- defines += [ "MIPS_DSP_R1_LE" ]
- } else if (mips_dsp_rev == 2) {
- defines += [
- "MIPS_DSP_R1_LE",
- "MIPS_DSP_R2_LE",
- ]
- }
- }
-
- if (is_android && !is_clang) {
- # The Android NDK doesn"t provide optimized versions of these
- # functions. Ensure they are disabled for all compilers.
- cflags += [
- "-fno-builtin-cos",
- "-fno-builtin-sin",
- "-fno-builtin-cosf",
- "-fno-builtin-sinf",
- ]
- }
-
- if (use_libfuzzer || use_drfuzz || use_afl) {
- # Used in Chromium's overrides to disable logging
- defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ]
- }
-}
-
-config("common_objc") {
- libs = [ "Foundation.framework" ]
-}
-
-if (!build_with_chromium) {
- # Target to build all the WebRTC production code.
- rtc_static_library("webrtc") {
- # Only the root target should depend on this.
- visibility = [ "//:default" ]
-
- sources = []
- complete_static_lib = true
- defines = []
-
- deps = [
- ":webrtc_common",
- "api",
- "api:transport_api",
- "audio",
- "call",
- "common_audio",
- "common_video",
- "logging",
- "media",
- "modules",
- "modules/video_capture:video_capture_internal_impl",
- "ortc",
- "p2p",
- "pc",
- "rtc_base",
- "sdk",
- "stats",
- "system_wrappers:system_wrappers_default",
- "video",
- "voice_engine",
- ]
-
- if (rtc_enable_protobuf) {
- defines += [ "ENABLE_RTC_EVENT_LOG" ]
- deps += [ "logging:rtc_event_log_proto" ]
- }
- }
-
- if (rtc_include_tests) {
- # Target to build all the WebRTC tests (but not examples or tools).
- # Executable in order to get a target that links all WebRTC code.
- rtc_executable("webrtc_tests") {
- testonly = true
-
- # Only the root target should depend on this.
- visibility = [ "//:default" ]
-
- deps = [
- ":rtc_unittests",
- ":video_engine_tests",
- ":webrtc_nonparallel_tests",
- ":webrtc_perf_tests",
- "common_audio:common_audio_unittests",
- "common_video:common_video_unittests",
- "media:rtc_media_unittests",
- "modules:modules_tests",
- "modules:modules_unittests",
- "modules/audio_coding:audio_coding_tests",
- "modules/audio_processing:audio_processing_tests",
- "modules/remote_bitrate_estimator:bwe_simulations_tests",
- "modules/rtp_rtcp:test_packet_masks_metrics",
- "modules/video_capture:video_capture_internal_impl",
- "ortc:ortc_unittests",
- "pc:peerconnection_unittests",
- "pc:rtc_pc_unittests",
- "rtc_base:rtc_base_tests_utils",
- "stats:rtc_stats_unittests",
- "system_wrappers:system_wrappers_unittests",
- "test",
- "video:screenshare_loopback",
- "video:video_loopback",
- "voice_engine:voice_engine_unittests",
- ]
- if (is_android) {
- deps += [
- ":android_junit_tests",
- "sdk/android:libjingle_peerconnection_android_unittest",
- ]
- } else {
- deps += [ "modules/video_capture:video_capture_tests" ]
- }
- if (!is_ios) {
- deps += [ "voice_engine:voe_auto_test" ]
- }
- if (rtc_enable_protobuf) {
- deps += [
- "audio:low_bandwidth_audio_test",
- "logging:rtc_event_log2rtp_dump",
- ]
- }
- }
- }
-}
-
-rtc_static_library("webrtc_common") {
- # TODO(mbonadei): Remove (bugs.webrtc.org/7745)
- # Enabling GN check triggers cyclic dependency error:
- # :webrtc_common ->
- # api:video_frame_api ->
- # system_wrappers:system_wrappers ->
- # webrtc_common
- check_includes = false
- sources = [
- "common_types.cc",
- "common_types.h",
- "typedefs.h",
- ]
-
- if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
- }
-}
-
-if (use_libfuzzer || use_drfuzz || use_afl) {
- # This target is only here for gn to discover fuzzer build targets under
- # webrtc/test/fuzzers/.
- group("webrtc_fuzzers_dummy") {
- testonly = true
- deps = [
- "test/fuzzers:webrtc_fuzzer_main",
- ]
- }
-}
-
-if (rtc_include_tests) {
- config("rtc_unittests_config") {
- # GN orders flags on a target before flags from configs. The default config
- # adds -Wall, and this flag have to be after -Wall -- so they need to
- # come from a config and can"t be on the target directly.
- if (is_clang) {
- cflags = [
- "-Wno-sign-compare",
- "-Wno-unused-const-variable",
- ]
- }
- }
-
- rtc_test("rtc_unittests") {
- testonly = true
-
- deps = [
- ":webrtc_common",
- "api:rtc_api_unittests",
- "api/audio_codecs/test:audio_codecs_api_unittests",
- "p2p:libstunprober_unittests",
- "p2p:rtc_p2p_unittests",
- "rtc_base:rtc_base_approved_unittests",
- "rtc_base:rtc_base_tests_main",
- "rtc_base:rtc_base_tests_utils",
- "rtc_base:rtc_base_unittests",
- "rtc_base:rtc_numerics_unittests",
- "rtc_base:rtc_task_queue_unittests",
- "rtc_base:sequenced_task_checker_unittests",
- "rtc_base:weak_ptr_unittests",
- "system_wrappers:metrics_default",
- ]
-
- if (rtc_enable_protobuf) {
- deps += [ "logging:rtc_event_log_tests" ]
- }
-
- if (is_android) {
- deps += [ "//testing/android/native_test:native_test_support" ]
- shard_timeout = 900
- }
-
- if (is_ios || is_mac) {
- deps += [ "sdk:sdk_unittests_objc" ]
- }
- }
-
- # TODO(pbos): Rename test suite, this is no longer "just" for video targets.
- video_engine_tests_resources = [
- "../resources/foreman_cif_short.yuv",
- "../resources/voice_engine/audio_long16.pcm",
- ]
-
- if (is_ios) {
- bundle_data("video_engine_tests_bundle_data") {
- testonly = true
- sources = video_engine_tests_resources
- outputs = [
- "{{bundle_resources_dir}}/{{source_file_part}}",
- ]
- }
- }
-
- rtc_test("video_engine_tests") {
- testonly = true
- deps = [
- "audio:audio_tests",
-
- # TODO(eladalon): call_tests aren't actually video-specific, so we
- # should move them to a more appropriate test suite.
- "call:call_tests",
- "modules/video_capture",
- "rtc_base:rtc_base_tests_utils",
- "test:test_common",
- "test:test_main",
- "test:video_test_common",
- "video:video_tests",
- ]
- data = video_engine_tests_resources
- if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
- }
- if (is_android) {
- deps += [ "//testing/android/native_test:native_test_native_code" ]
- shard_timeout = 900
- }
- if (is_ios) {
- deps += [ ":video_engine_tests_bundle_data" ]
- }
- }
-
- webrtc_perf_tests_resources = [
- "../resources/audio_coding/speech_mono_16kHz.pcm",
- "../resources/audio_coding/speech_mono_32_48kHz.pcm",
- "../resources/audio_coding/testfile32kHz.pcm",
- "../resources/ConferenceMotion_1280_720_50.yuv",
- "../resources/difficult_photo_1850_1110.yuv",
- "../resources/foreman_cif.yuv",
- "../resources/google-wifi-3mbps.rx",
- "../resources/paris_qcif.yuv",
- "../resources/photo_1850_1110.yuv",
- "../resources/presentation_1850_1110.yuv",
- "../resources/verizon4g-downlink.rx",
- "../resources/voice_engine/audio_long16.pcm",
- "../resources/web_screenshot_1850_1110.yuv",
- ]
-
- if (is_ios) {
- bundle_data("webrtc_perf_tests_bundle_data") {
- testonly = true
- sources = webrtc_perf_tests_resources
- outputs = [
- "{{bundle_resources_dir}}/{{source_file_part}}",
- ]
- }
- }
-
- rtc_test("webrtc_perf_tests") {
- testonly = true
- configs += [ ":rtc_unittests_config" ]
-
- deps = [
- "audio:audio_perf_tests",
- "call:call_perf_tests",
- "modules/audio_coding:audio_coding_perf_tests",
- "modules/audio_processing:audio_processing_perf_tests",
- "modules/remote_bitrate_estimator:remote_bitrate_estimator_perf_tests",
- "test:test_main",
- "video:video_full_stack_tests",
- ]
-
- data = webrtc_perf_tests_resources
- if (is_android) {
- deps += [ "//testing/android/native_test:native_test_native_code" ]
- shard_timeout = 2700
- }
- if (is_ios) {
- deps += [ ":webrtc_perf_tests_bundle_data" ]
- }
- }
-
- rtc_test("webrtc_nonparallel_tests") {
- testonly = true
- deps = [
- "rtc_base:rtc_base_nonparallel_tests",
- ]
- if (is_android) {
- deps += [ "//testing/android/native_test:native_test_support" ]
- shard_timeout = 900
- }
- }
-
- if (is_android) {
- junit_binary("android_junit_tests") {
- java_files = [
- "examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java",
- "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java",
- "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java",
- "sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java",
- ]
-
- deps = [
- "examples:AppRTCMobile_javalib",
- "sdk/android:libjingle_peerconnection_java",
- "//base:base_java_test_support",
- ]
- }
- }
-}
diff --git a/webrtc/DEPS b/webrtc/DEPS
deleted file mode 100644
index 0459f4c..0000000
--- a/webrtc/DEPS
+++ /dev/null
@@ -1,34 +0,0 @@
-# Define rules for which include paths are allowed in our source.
-include_rules = [
- # Base is only used to build Android APK tests and may not be referenced by
- # WebRTC production code.
- "-base",
- "-chromium",
- "+external/webrtc/webrtc", # Android platform build.
- "+gflags",
- "+libyuv",
- "-webrtc", # Has to be disabled; otherwise all dirs below will be allowed.
- # Individual headers that will be moved out of here, see webrtc:4243.
- "+webrtc/call/rtp_config.h",
- "+webrtc/common_types.h",
- "+webrtc/transport.h",
- "+webrtc/typedefs.h",
- "+webrtc/voice_engine_configurations.h",
-
- "+WebRTC",
- "+webrtc/api",
- "+webrtc/modules/include",
- "+webrtc/rtc_base",
- "+webrtc/test",
- "+webrtc/rtc_tools",
-]
-
-# The below rules will be removed when webrtc:4243 is fixed.
-specific_include_rules = {
- "video_receive_stream\.h": [
- "+webrtc/call/video_receive_stream.h",
- ],
- "video_send_stream\.h": [
- "+webrtc/call/video_send_stream.h",
- ],
-}
diff --git a/webrtc/LICENSE b/webrtc/LICENSE
deleted file mode 100644
index 4c41b7b..0000000
--- a/webrtc/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2011, The WebRTC project authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- * Neither the name of Google nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/webrtc/LICENSE_THIRD_PARTY b/webrtc/LICENSE_THIRD_PARTY
deleted file mode 100644
index af1aa50..0000000
--- a/webrtc/LICENSE_THIRD_PARTY
+++ /dev/null
@@ -1,458 +0,0 @@
-This source tree contains third party source code which is governed by third
-party licenses. Paths to the files and associated licenses are collected here.
-
-Files governed by third party licenses:
-base/base64.cc
-base/base64.h
-base/md5.cc
-base/md5.h
-base/sha1.cc
-base/sha1.h
-base/sigslot.cc
-base/sigslot.h
-common_audio/fft4g.c
-common_audio/signal_processing/spl_sqrt_floor.c
-common_audio/signal_processing/spl_sqrt_floor_arm.S
-modules/audio_coding/codecs/g711/main/source/g711.c
-modules/audio_coding/codecs/g711/main/source/g711.h
-modules/audio_coding/codecs/g722/main/source/g722_decode.c
-modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
-modules/audio_coding/codecs/g722/main/source/g722_encode.c
-modules/audio_coding/codecs/isac/main/source/fft.c
-modules/audio_device/mac/portaudio/pa_memorybarrier.h
-modules/audio_device/mac/portaudio/pa_ringbuffer.c
-modules/audio_device/mac/portaudio/pa_ringbuffer.h
-modules/audio_processing/aec/aec_rdft.c
-system_wrappers/source/condition_variable_event_win.cc
-system_wrappers/source/set_thread_name_win.h
-
-Individual licenses for each file:
--------------------------------------------------------------------------------
-Files:
-base/base64.cc
-base/base64.h
-
-License:
-//*********************************************************************
-//* Base64 - a simple base64 encoder and decoder.
-//*
-//* Copyright (c) 1999, Bob Withers - bwit@pobox.com
-//*
-//* This code may be freely used for any purpose, either personal
-//* or commercial, provided the authors copyright notice remains
-//* intact.
-//*
-//* Enhancements by Stanley Yamane:
-//* o reverse lookup table for the decode function
-//* o reserve string buffer space in advance
-//*
-//*********************************************************************
--------------------------------------------------------------------------------
-Files:
-base/md5.cc
-base/md5.h
-
-License:
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest. This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
--------------------------------------------------------------------------------
-Files:
-base/sha1.cc
-base/sha1.h
-
-License:
-/*
- * SHA-1 in C
- * By Steve Reid <sreid@sea-to-sky.net>
- * 100% Public Domain
- *
- * -----------------
- * Modified 7/98
- * By James H. Brown <jbrown@burgoyne.com>
- * Still 100% Public Domain
- *
--------------------------------------------------------------------------------
-Files:
-base/sigslot.cc
-base/sigslot.h
-
-License:
-// sigslot.h: Signal/Slot classes
-//
-// Written by Sarah Thompson (sarah@telergy.com) 2002.
-//
-// License: Public domain. You are free to use this code however you like, with
-// the proviso that the author takes on no responsibility or liability for any
-// use.
--------------------------------------------------------------------------------
-Files:
-common_audio/signal_processing/spl_sqrt_floor.c
-common_audio/signal_processing/spl_sqrt_floor_arm.S
-
-License:
-/*
- * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
- * license.
- *
- * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
- * Date: Fri, Jun 24, 2011 at 3:20 AM
- * Subject: Re: sqrt routine
- * To: Kevin Ma <kma@google.com>
- * Hi Kevin,
- * Thanks for asking. Those routines are public domain (originally posted to
- * comp.sys.arm a long time ago), so you can use them freely for any purpose.
- * Cheers,
- * Wilco
- *
- * ----- Original Message -----
- * From: "Kevin Ma" <kma@google.com>
- * To: <Wilco.Dijkstra@ntlworld.com>
- * Sent: Thursday, June 23, 2011 11:44 PM
- * Subject: Fwd: sqrt routine
- * Hi Wilco,
- * I saw your sqrt routine from several web sites, including
- * http://www.finesse.demon.co.uk/steven/sqrt.html.
- * Just wonder if there's any copyright information with your Successive
- * approximation routines, or if I can freely use it for any purpose.
- * Thanks.
- * Kevin
- */
--------------------------------------------------------------------------------
-Files:
-modules/audio_coding/codecs/g711/main/source/g711.c
-modules/audio_coding/codecs/g711/main/source/g711.h
-
-License:
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * g711.h - In line A-law and u-law conversion routines
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2001 Steve Underwood
- *
- * Despite my general liking of the GPL, I place this code in the
- * public domain for the benefit of all mankind - even the slimy
- * ones who might try to proprietize my work and use it to my
- * detriment.
- */
--------------------------------------------------------------------------------
-Files:
-modules/audio_coding/codecs/g722/main/source/g722_decode.c
-modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
-modules/audio_coding/codecs/g722/main/source/g722_encode.c
-
-License:
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * g722_decode.c - The ITU G.722 codec, decode part.
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2005 Steve Underwood
- *
- * Despite my general liking of the GPL, I place my own contributions
- * to this code in the public domain for the benefit of all mankind -
- * even the slimy ones who might try to proprietize my work and use it
- * to my detriment.
- *
- * Based in part on a single channel G.722 codec which is:
- *
- * Copyright (c) CMU 1993
- * Computer Science, Speech Group
- * Chengxiang Lu and Alex Hauptmann
- */
--------------------------------------------------------------------------------
-Files:
-modules/audio_coding/codecs/isac/main/source/fft.c
-
-License:
-/*
- * Copyright(c)1995,97 Mark Olesen <olesen@me.QueensU.CA>
- * Queen's Univ at Kingston (Canada)
- *
- * Permission to use, copy, modify, and distribute this software for
- * any purpose without fee is hereby granted, provided that this
- * entire notice is included in all copies of any software which is
- * or includes a copy or modification of this software and in all
- * copies of the supporting documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR QUEEN'S
- * UNIVERSITY AT KINGSTON MAKES ANY REPRESENTATION OR WARRANTY OF ANY
- * KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
- * FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- * All of which is to say that you can do what you like with this
- * source code provided you don't try to sell it as your own and you
- * include an unaltered copy of this message (including the
- * copyright).
- *
- * It is also implicitly understood that bug fixes and improvements
- * should make their way back to the general Internet community so
- * that everyone benefits.
- */
--------------------------------------------------------------------------------
-Files:
-modules/audio_device/mac/portaudio/pa_memorybarrier.h
-modules/audio_device/mac/portaudio/pa_ringbuffer.c
-modules/audio_device/mac/portaudio/pa_ringbuffer.h
-
-License:
-/*
- * $Id: pa_memorybarrier.h 1240 2007-07-17 13:05:07Z bjornroche $
- * Portable Audio I/O Library
- * Memory barrier utilities
- *
- * Author: Bjorn Roche, XO Audio, LLC
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/*
- * $Id: pa_ringbuffer.c 1421 2009-11-18 16:09:05Z bjornroche $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on Mac OS X by Bjorn Roche
- * modified for SMP safety on Linux by Leland Lucius
- * also, allowed for const where possible
- * modified for multiple-byte-sized data elements by Sven Fischer
- *
- * Note that this is safe only for a single-thread reader and a
- * single-thread writer.
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
--------------------------------------------------------------------------------
-Files:
-common_audio/fft4g.c
-modules/audio_processing/aec/aec_rdft.c
-
-License:
-/*
- * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
- * Copyright Takuya OOURA, 1996-2001
- *
- * You may use, copy, modify and distribute this code for any purpose (include
- * commercial use) and without fee. Please refer to this package when you modify
- * this code.
- */
--------------------------------------------------------------------------------
-Files:
-system_wrappers/source/condition_variable_event_win.cc
-
-Source:
-http://www1.cse.wustl.edu/~schmidt/ACE-copying.html
-
-License:
-Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM),
-and CoSMIC(TM)
-
-ACE(TM), TAO(TM), CIAO(TM), DAnCE>(TM), and CoSMIC(TM) (henceforth referred to
-as "DOC software") are copyrighted by Douglas C. Schmidt and his research
-group at Washington University, University of California, Irvine, and
-Vanderbilt University, Copyright (c) 1993-2009, all rights reserved. Since DOC
-software is open-source, freely available software, you are free to use,
-modify, copy, and distribute--perpetually and irrevocably--the DOC software
-source code and object code produced from the source, as well as copy and
-distribute modified versions of this software. You must, however, include this
-copyright statement along with any code built using DOC software that you
-release. No copyright statement needs to be provided if you just ship binary
-executables of your software products.
-You can use DOC software in commercial and/or binary software releases and are
-under no obligation to redistribute any of your source code that is built
-using DOC software. Note, however, that you may not misappropriate the DOC
-software code, such as copyrighting it yourself or claiming authorship of the
-DOC software code, in a way that will prevent DOC software from being
-distributed freely using an open-source development model. You needn't inform
-anyone that you're using DOC software in your software, though we encourage
-you to let us know so we can promote your project in the DOC software success
-stories.
-
-The ACE, TAO, CIAO, DAnCE, and CoSMIC web sites are maintained by the DOC
-Group at the Institute for Software Integrated Systems (ISIS) and the Center
-for Distributed Object Computing of Washington University, St. Louis for the
-development of open-source software as part of the open-source software
-community. Submissions are provided by the submitter ``as is'' with no
-warranties whatsoever, including any warranty of merchantability,
-noninfringement of third party intellectual property, or fitness for any
-particular purpose. In no event shall the submitter be liable for any direct,
-indirect, special, exemplary, punitive, or consequential damages, including
-without limitation, lost profits, even if advised of the possibility of such
-damages. Likewise, DOC software is provided as is with no warranties of any
-kind, including the warranties of design, merchantability, and fitness for a
-particular purpose, noninfringement, or arising from a course of dealing,
-usage or trade practice. Washington University, UC Irvine, Vanderbilt
-University, their employees, and students shall have no liability with respect
-to the infringement of copyrights, trade secrets or any patents by DOC
-software or any part thereof. Moreover, in no event will Washington
-University, UC Irvine, or Vanderbilt University, their employees, or students
-be liable for any lost revenue or profits or other special, indirect and
-consequential damages.
-
-DOC software is provided with no support and without any obligation on the
-part of Washington University, UC Irvine, Vanderbilt University, their
-employees, or students to assist in its use, correction, modification, or
-enhancement. A number of companies around the world provide commercial support
-for DOC software, however. DOC software is Y2K-compliant, as long as the
-underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant
-with the new US daylight savings rule passed by Congress as "The Energy Policy
-Act of 2005," which established new daylight savings times (DST) rules for the
-United States that expand DST as of March 2007. Since DOC software obtains
-time/date and calendaring information from operating systems users will not be
-affected by the new DST rules as long as they upgrade their operating systems
-accordingly.
-
-The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM), Washington
-University, UC Irvine, and Vanderbilt University, may not be used to endorse
-or promote products or services derived from this source without express
-written permission from Washington University, UC Irvine, or Vanderbilt
-University. This license grants no permission to call products or services
-derived from this source ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM),
-nor does it grant permission for the name Washington University, UC Irvine, or
-Vanderbilt University to appear in their names.
--------------------------------------------------------------------------------
-Files:
-system_wrappers/source/set_thread_name_win.h
-
-Source:
-http://msdn.microsoft.com/en-us/cc300389.aspx#P
-
-License:
-This license governs use of code marked as “sample” or “example” available on
-this web site without a license agreement, as provided under the section above
-titled “NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE.” If you use
-such code (the “software”), you accept this license. If you do not accept the
-license, do not use the software.
-
-1. Definitions
-
-The terms “reproduce,” “reproduction,” “derivative works,” and “distribution”
-have the same meaning here as under U.S. copyright law.
-
-A “contribution” is the original software, or any additions or changes to the
-software.
-
-A “contributor” is any person that distributes its contribution under this
-license.
-
-“Licensed patents” are a contributor’s patent claims that read directly on its
-contribution.
-
-2. Grant of Rights
-
-(A) Copyright Grant - Subject to the terms of this license, including the
-license conditions and limitations in section 3, each contributor grants you a
-non-exclusive, worldwide, royalty-free copyright license to reproduce its
-contribution, prepare derivative works of its contribution, and distribute its
-contribution or any derivative works that you create.
-
-(B) Patent Grant - Subject to the terms of this license, including the license
-conditions and limitations in section 3, each contributor grants you a
-non-exclusive, worldwide, royalty-free license under its licensed patents to
-make, have made, use, sell, offer for sale, import, and/or otherwise dispose
-of its contribution in the software or derivative works of the contribution in
-the software.
-
-3. Conditions and Limitations
-
-(A) No Trademark License- This license does not grant you rights to use any
-contributors’ name, logo, or trademarks.
-
-(B) If you bring a patent claim against any contributor over patents that you
-claim are infringed by the software, your patent license from such contributor
-to the software ends automatically.
-
-(C) If you distribute any portion of the software, you must retain all
-copyright, patent, trademark, and attribution notices that are present in the
-software.
-
-(D) If you distribute any portion of the software in source code form, you may
-do so only under this license by including a complete copy of this license
-with your distribution. If you distribute any portion of the software in
-compiled or object code form, you may only do so under a license that complies
-with this license.
-
-(E) The software is licensed “as-is.” You bear the risk of using it. The
-contributors give no express warranties, guarantees or conditions. You may
-have additional consumer rights under your local laws which this license
-cannot change. To the extent permitted under your local laws, the contributors
-exclude the implied warranties of merchantability, fitness for a particular
-purpose and non-infringement.
-
-(F) Platform Limitation - The licenses granted in sections 2(A) and 2(B)
-extend only to the software or derivative works that you create that run on a
-Microsoft Windows operating system product.
-
diff --git a/webrtc/OWNERS b/webrtc/OWNERS
deleted file mode 100644
index 025c721..0000000
--- a/webrtc/OWNERS
+++ /dev/null
@@ -1,13 +0,0 @@
-henrika@webrtc.org
-kwiberg@webrtc.org
-mflodman@webrtc.org
-niklas.enbom@webrtc.org
-stefan@webrtc.org
-tina.legrand@webrtc.org
-tommi@webrtc.org
-
-per-file *.gn=kjellander@webrtc.org
-per-file *.gni=kjellander@webrtc.org
-
-per-file *video*.h=pbos@webrtc.org
-per-file DEPS=kjellander@webrtc.org
diff --git a/webrtc/PATENTS b/webrtc/PATENTS
deleted file mode 100644
index 190607a..0000000
--- a/webrtc/PATENTS
+++ /dev/null
@@ -1,24 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the WebRTC code package.
-
-Google hereby grants to you a perpetual, worldwide, non-exclusive,
-no-charge, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import,
-transfer, and otherwise run, modify and propagate the contents of this
-implementation of the WebRTC code package, where such license applies
-only to those patent claims, both currently owned by Google and
-acquired in the future, licensable by Google that are necessarily
-infringed by this implementation of the WebRTC code package. This
-grant does not include claims that would be infringed only as a
-consequence of further modification of this implementation. If you or
-your agent or exclusive licensee institute or order or agree to the
-institution of patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that this
-implementation of the WebRTC code package or any code incorporated
-within this implementation of the WebRTC code package constitutes
-direct or contributory patent infringement, or inducement of patent
-infringement, then any patent rights granted to you under this License
-for this implementation of the WebRTC code package shall terminate as
-of the date such litigation is filed.
diff --git a/webrtc/PRESUBMIT.py b/webrtc/PRESUBMIT.py
deleted file mode 100644
index 4132c16..0000000
--- a/webrtc/PRESUBMIT.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-def _LicenseHeader(input_api):
- """Returns the license header regexp."""
- # Accept any year number from 2003 to the current year
- current_year = int(input_api.time.strftime('%Y'))
- allowed_years = (str(s) for s in reversed(xrange(2003, current_year + 1)))
- years_re = '(' + '|'.join(allowed_years) + ')'
- license_header = (
- r'.*? Copyright( \(c\))? %(year)s The WebRTC [Pp]roject [Aa]uthors\. '
- r'All [Rr]ights [Rr]eserved\.\n'
- r'.*?\n'
- r'.*? Use of this source code is governed by a BSD-style license\n'
- r'.*? that can be found in the LICENSE file in the root of the source\n'
- r'.*? tree\. An additional intellectual property rights grant can be '
- r'found\n'
- r'.*? in the file PATENTS\. All contributing project authors may\n'
- r'.*? be found in the AUTHORS file in the root of the source tree\.\n'
- ) % {
- 'year': years_re,
- }
- return license_header
-
-def _CommonChecks(input_api, output_api):
- """Checks common to both upload and commit."""
- results = []
- results.extend(input_api.canned_checks.CheckLicense(
- input_api, output_api, _LicenseHeader(input_api)))
- return results
-
-def CheckChangeOnUpload(input_api, output_api):
- results = []
- results.extend(_CommonChecks(input_api, output_api))
- return results
-
-def CheckChangeOnCommit(input_api, output_api):
- results = []
- results.extend(_CommonChecks(input_api, output_api))
- return results
diff --git a/webrtc/codereview.settings b/webrtc/codereview.settings
deleted file mode 100644
index 37cff97..0000000
--- a/webrtc/codereview.settings
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Creating CLs from this location is not supported! Please make sure the current
-working directory is the parent directory of this directory.
-If you're working with a Chromium checkout, you'll have to create a full WebRTC
-checkout and upload a CL from that. See
-https://webrtc.org/native-code/development/ for instructions.
diff --git a/webrtc/whitespace.txt b/whitespace.txt
similarity index 100%
rename from webrtc/whitespace.txt
rename to whitespace.txt
