35 files changed, 125 insertions, 133 deletions
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 7e4556bf33..59c4b7a558 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -298,11 +298,11 @@
             'video_coding/test/stream_generator.cc',
             'video_coding/test/stream_generator.h',
             'video_coding/utility/quality_scaler_unittest.cc',
-            'video_processing/main/test/unit_test/brightness_detection_test.cc',
-            'video_processing/main/test/unit_test/content_metrics_test.cc',
-            'video_processing/main/test/unit_test/deflickering_test.cc',
-            'video_processing/main/test/unit_test/video_processing_unittest.cc',
-            'video_processing/main/test/unit_test/video_processing_unittest.h',
+            'video_processing/test/brightness_detection_test.cc',
+            'video_processing/test/content_metrics_test.cc',
+            'video_processing/test/deflickering_test.cc',
+            'video_processing/test/video_processing_unittest.cc',
+            'video_processing/test/video_processing_unittest.h',
           ],
           'conditions': [
             ['enable_bwe_test_logging==1', {
diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn
index 00d2911eef..43df0802ad 100644
--- a/webrtc/modules/video_processing/BUILD.gn
+++ b/webrtc/modules/video_processing/BUILD.gn
@@ -12,24 +12,24 @@ build_video_processing_sse2 = current_cpu == "x86" || current_cpu == "x64"
 
 source_set("video_processing") {
   sources = [
-    "main/interface/video_processing.h",
-    "main/interface/video_processing_defines.h",
-    "main/source/brighten.cc",
-    "main/source/brighten.h",
-    "main/source/brightness_detection.cc",
-    "main/source/brightness_detection.h",
-    "main/source/content_analysis.cc",
-    "main/source/content_analysis.h",
-    "main/source/deflickering.cc",
-    "main/source/deflickering.h",
-    "main/source/frame_preprocessor.cc",
-    "main/source/frame_preprocessor.h",
-    "main/source/spatial_resampler.cc",
-    "main/source/spatial_resampler.h",
-    "main/source/video_decimator.cc",
-    "main/source/video_decimator.h",
-    "main/source/video_processing_impl.cc",
-    "main/source/video_processing_impl.h",
+    "brighten.cc",
+    "brighten.h",
+    "brightness_detection.cc",
+    "brightness_detection.h",
+    "content_analysis.cc",
+    "content_analysis.h",
+    "deflickering.cc",
+    "deflickering.h",
+    "frame_preprocessor.cc",
+    "frame_preprocessor.h",
+    "include/video_processing.h",
+    "include/video_processing_defines.h",
+    "spatial_resampler.cc",
+    "spatial_resampler.h",
+    "video_decimator.cc",
+    "video_decimator.h",
+    "video_processing_impl.cc",
+    "video_processing_impl.h",
   ]
 
   deps = [
@@ -55,7 +55,7 @@ source_set("video_processing") {
 if (build_video_processing_sse2) {
   source_set("video_processing_sse2") {
     sources = [
-      "main/source/content_analysis_sse2.cc",
+      "content_analysis_sse2.cc",
     ]
 
     configs += [ "../..:common_config" ]
diff --git a/webrtc/modules/video_processing/main/source/brighten.cc b/webrtc/modules/video_processing/brighten.cc
index 1fe813e7b0..1abd5f105a 100644
--- a/webrtc/modules/video_processing/main/source/brighten.cc
+++ b/webrtc/modules/video_processing/brighten.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/brighten.h"
+#include "webrtc/modules/video_processing/brighten.h"
 
 #include <stdlib.h>
 
diff --git a/webrtc/modules/video_processing/main/source/brighten.h b/webrtc/modules/video_processing/brighten.h
index 151d7a3b51..50fddbf8f7 100644
--- a/webrtc/modules/video_processing/main/source/brighten.h
+++ b/webrtc/modules/video_processing/brighten.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
-#define MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -22,4 +22,4 @@ int32_t Brighten(VideoFrame* frame, int delta);
 }  // namespace VideoProcessing
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_
diff --git a/webrtc/modules/video_processing/main/source/brightness_detection.cc b/webrtc/modules/video_processing/brightness_detection.cc
index bae225b3b0..eefb7966ec 100644
--- a/webrtc/modules/video_processing/main/source/brightness_detection.cc
+++ b/webrtc/modules/video_processing/brightness_detection.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/brightness_detection.h"
 
 #include <math.h>
 
diff --git a/webrtc/modules/video_processing/main/source/brightness_detection.h b/webrtc/modules/video_processing/brightness_detection.h
index 48532b4a20..7c21b512f0 100644
--- a/webrtc/modules/video_processing/main/source/brightness_detection.h
+++ b/webrtc/modules/video_processing/brightness_detection.h
@@ -8,12 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-/*
- * brightness_detection.h
- */
-#ifndef MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
-#define MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_
+
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -34,4 +32,4 @@ class VPMBrightnessDetection {
 
 }  // namespace webrtc
 
-#endif // MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_
diff --git a/webrtc/modules/video_processing/main/source/content_analysis.cc b/webrtc/modules/video_processing/content_analysis.cc
index d29db27408..875a249f14 100644
--- a/webrtc/modules/video_processing/main/source/content_analysis.cc
+++ b/webrtc/modules/video_processing/content_analysis.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/webrtc/modules/video_processing/main/source/content_analysis.h b/webrtc/modules/video_processing/content_analysis.h
index 5b0767ac04..030f5e96b2 100644
--- a/webrtc/modules/video_processing/main/source/content_analysis.h
+++ b/webrtc/modules/video_processing/content_analysis.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_
 
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
 
@@ -84,4 +84,4 @@ class VPMContentAnalysis {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_
diff --git a/webrtc/modules/video_processing/main/source/content_analysis_sse2.cc b/webrtc/modules/video_processing/content_analysis_sse2.cc
index 17b64ff280..0e1805a44a 100644
--- a/webrtc/modules/video_processing/main/source/content_analysis_sse2.cc
+++ b/webrtc/modules/video_processing/content_analysis_sse2.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
 
 #include <emmintrin.h>
 #include <math.h>
diff --git a/webrtc/modules/video_processing/main/source/deflickering.cc b/webrtc/modules/video_processing/deflickering.cc
index fad47a1ffe..b91bc16f38 100644
--- a/webrtc/modules/video_processing/main/source/deflickering.cc
+++ b/webrtc/modules/video_processing/deflickering.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/deflickering.h"
+#include "webrtc/modules/video_processing/deflickering.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/webrtc/modules/video_processing/main/source/deflickering.h b/webrtc/modules/video_processing/deflickering.h
index 36e6845d71..7e61f819a0 100644
--- a/webrtc/modules/video_processing/main/source/deflickering.h
+++ b/webrtc/modules/video_processing/deflickering.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_
 
 #include <string.h>  // NULL
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -53,4 +53,4 @@ class VPMDeflickering {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_
diff --git a/webrtc/modules/video_processing/main/source/frame_preprocessor.cc b/webrtc/modules/video_processing/frame_preprocessor.cc
index a9d77c2e0c..a3ec3c8c1c 100644
--- a/webrtc/modules/video_processing/main/source/frame_preprocessor.cc
+++ b/webrtc/modules/video_processing/frame_preprocessor.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
+#include "webrtc/modules/video_processing/frame_preprocessor.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/video_processing/main/source/frame_preprocessor.h b/webrtc/modules/video_processing/frame_preprocessor.h
index 895e457cc6..c5313b4066 100644
--- a/webrtc/modules/video_processing/main/source/frame_preprocessor.h
+++ b/webrtc/modules/video_processing/frame_preprocessor.h
@@ -11,13 +11,13 @@
 /*
  * frame_preprocessor.h
  */
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
-#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
-#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
+#include "webrtc/modules/video_processing/spatial_resampler.h"
+#include "webrtc/modules/video_processing/video_decimator.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -76,4 +76,4 @@ class VPMFramePreprocessor {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
diff --git a/webrtc/modules/video_processing/main/interface/video_processing.h b/webrtc/modules/video_processing/include/video_processing.h
index 377a098229..bf1ba82b27 100644
--- a/webrtc/modules/video_processing/main/interface/video_processing.h
+++ b/webrtc/modules/video_processing/include/video_processing.h
@@ -15,12 +15,12 @@
  */
 
 
-#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
-#define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_
 
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 #include "webrtc/video_frame.h"
 
 /**
@@ -267,4 +267,4 @@ class VideoProcessingModule : public Module {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_
diff --git a/webrtc/modules/video_processing/main/interface/video_processing_defines.h b/webrtc/modules/video_processing/include/video_processing_defines.h
index 93a0658966..af9b650a69 100644
--- a/webrtc/modules/video_processing/main/interface/video_processing_defines.h
+++ b/webrtc/modules/video_processing/include/video_processing_defines.h
@@ -13,8 +13,8 @@
  * This header file includes the definitions used in the video processor module
  */
 
-#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
-#define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_
 
 #include "webrtc/typedefs.h"
 
@@ -38,4 +38,4 @@ enum VideoFrameResampling {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_
diff --git a/webrtc/modules/video_processing/main/source/OWNERS b/webrtc/modules/video_processing/main/source/OWNERS
deleted file mode 100644
index 3ee6b4bf5f..0000000000
--- a/webrtc/modules/video_processing/main/source/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# These are for the common case of adding or renaming files. If you're doing
-# structural changes, please get a review from a reviewer in this file.
-per-file *.gyp=*
-per-file *.gypi=*
diff --git a/webrtc/modules/video_processing/main/source/spatial_resampler.cc b/webrtc/modules/video_processing/spatial_resampler.cc
index 9360e68b41..e5254fa852 100644
--- a/webrtc/modules/video_processing/main/source/spatial_resampler.cc
+++ b/webrtc/modules/video_processing/spatial_resampler.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
+#include "webrtc/modules/video_processing/spatial_resampler.h"
 
 
 namespace webrtc {
diff --git a/webrtc/modules/video_processing/main/source/spatial_resampler.h b/webrtc/modules/video_processing/spatial_resampler.h
index 9a2d8f58c9..064aeb774c 100644
--- a/webrtc/modules/video_processing/main/source/spatial_resampler.h
+++ b/webrtc/modules/video_processing/spatial_resampler.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_
 
 #include "webrtc/typedefs.h"
 
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 
 #include "webrtc/common_video/libyuv/include/scaler.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -58,4 +58,4 @@ class VPMSimpleSpatialResampler : public VPMSpatialResampler {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_
diff --git a/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc b/webrtc/modules/video_processing/test/brightness_detection_test.cc
index 4d0de3ac98..08fd5beaaf 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc
+++ b/webrtc/modules/video_processing/test/brightness_detection_test.cc
@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 using namespace webrtc;
diff --git a/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc b/webrtc/modules/video_processing/test/content_metrics_test.cc
index d9c1309d9b..7c727d0745 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc
+++ b/webrtc/modules/video_processing/test/content_metrics_test.cc
@@ -9,9 +9,9 @@
  */
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/video_processing/main/test/unit_test/createTable.m b/webrtc/modules/video_processing/test/createTable.m
index 2c7fb522f6..fe8777ee71 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/createTable.m
+++ b/webrtc/modules/video_processing/test/createTable.m
@@ -31,7 +31,7 @@ A=(1-B)/r0;
 f0=A*x0.^2+B*x0; % compander function in zone 1
 
 % equation system for finding second zone parameters
-M=[r0^3 r0^2 r0 1; 
+M=[r0^3 r0^2 r0 1;
     3*r0^2 2*r0 1 0;
     3*r1^2 2*r1 1 0;
     r1^3 r1^2 r1 1];
@@ -173,7 +173,7 @@ for k=1:size(y,3)
         end
     end
 end
-      
+
 fprintf('\nWriting modified test file...')
 writeYUV420file('../out/Debug/foremanColorEnhanced.yuv',y,unew,vnew);
 fprintf(' done\n');
diff --git a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc b/webrtc/modules/video_processing/test/deflickering_test.cc
index 83d09ef486..489f04720d 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc
+++ b/webrtc/modules/video_processing/test/deflickering_test.cc
@@ -12,8 +12,8 @@
 #include <stdlib.h>
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
diff --git a/webrtc/modules/video_processing/main/test/unit_test/readYUV420file.m b/webrtc/modules/video_processing/test/readYUV420file.m
index 03013efd3a..f409820283 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/readYUV420file.m
+++ b/webrtc/modules/video_processing/test/readYUV420file.m
@@ -10,7 +10,7 @@ end
 nPx=width*height;
 
 % nPx bytes luminance, nPx/4 bytes U, nPx/4 bytes V
-frameSizeBytes = nPx*1.5; 
+frameSizeBytes = nPx*1.5;
 
 % calculate number of frames
 fseek(fid,0,'eof'); % move to end of file
@@ -27,19 +27,19 @@ V=uint8(zeros(height/2,width/2,numFrames));
 [X,nBytes]=fread(fid, frameSizeBytes, 'uchar');
 
 for k=1:numFrames
-    
+
     % Store luminance
     Y(:,:,k)=uint8(reshape(X(1:nPx), width, height).');
-    
+
     % Store U channel
     U(:,:,k)=uint8(reshape(X(nPx + (1:nPx/4)), width/2, height/2).');
 
     % Store V channel
     V(:,:,k)=uint8(reshape(X(nPx + nPx/4 + (1:nPx/4)), width/2, height/2).');
-    
+
     % Read next frame
     [X,nBytes]=fread(fid, frameSizeBytes, 'uchar');
 end
 
-    
+
 fclose(fid);
diff --git a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc b/webrtc/modules/video_processing/test/video_processing_unittest.cc
index 11ccc4891b..a4c702c486 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc
+++ b/webrtc/modules/video_processing/test/video_processing_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 
 #include <string>
 
diff --git a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h b/webrtc/modules/video_processing/test/video_processing_unittest.h
index 4a4fda41e6..2cb3a750fa 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h
+++ b/webrtc/modules/video_processing/test/video_processing_unittest.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
@@ -44,4 +44,4 @@ class VideoProcessingModuleTest : public ::testing::Test {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_
diff --git a/webrtc/modules/video_processing/main/test/unit_test/writeYUV420file.m b/webrtc/modules/video_processing/test/writeYUV420file.m
index 69a8808338..359445009b 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/writeYUV420file.m
+++ b/webrtc/modules/video_processing/test/writeYUV420file.m
@@ -11,10 +11,10 @@ numFrames=size(Y,3);
 for k=1:numFrames
    % Write luminance
    fwrite(fid,uint8(Y(:,:,k).'), 'uchar');
-   
+
    % Write U channel
    fwrite(fid,uint8(U(:,:,k).'), 'uchar');
-   
+
    % Write V channel
    fwrite(fid,uint8(V(:,:,k).'), 'uchar');
 end
diff --git a/webrtc/modules/video_processing/main/source/video_decimator.cc b/webrtc/modules/video_processing/video_decimator.cc
index 34c29c1677..af2c8249a0 100644
--- a/webrtc/modules/video_processing/main/source/video_decimator.cc
+++ b/webrtc/modules/video_processing/video_decimator.cc
@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/base/checks.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/video_decimator.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 
 #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b)
diff --git a/webrtc/modules/video_processing/main/source/video_decimator.h b/webrtc/modules/video_processing/video_decimator.h
index c052c30afa..9d44480dcd 100644
--- a/webrtc/modules/video_processing/main/source/video_decimator.h
+++ b/webrtc/modules/video_processing/video_decimator.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_
 
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/typedefs.h"
@@ -55,4 +55,4 @@ class VPMVideoDecimator {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_
diff --git a/webrtc/modules/video_processing/video_processing.gypi b/webrtc/modules/video_processing/video_processing.gypi
index 5827a5b1a6..25e2097007 100644
--- a/webrtc/modules/video_processing/video_processing.gypi
+++ b/webrtc/modules/video_processing/video_processing.gypi
@@ -18,24 +18,24 @@
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
-        'main/interface/video_processing.h',
-        'main/interface/video_processing_defines.h',
-        'main/source/brighten.cc',
-        'main/source/brighten.h',
-        'main/source/brightness_detection.cc',
-        'main/source/brightness_detection.h',
-        'main/source/content_analysis.cc',
-        'main/source/content_analysis.h',
-        'main/source/deflickering.cc',
-        'main/source/deflickering.h',
-        'main/source/frame_preprocessor.cc',
-        'main/source/frame_preprocessor.h',
-        'main/source/spatial_resampler.cc',
-        'main/source/spatial_resampler.h',
-        'main/source/video_decimator.cc',
-        'main/source/video_decimator.h',
-        'main/source/video_processing_impl.cc',
-        'main/source/video_processing_impl.h',
+        'include/video_processing.h',
+        'include/video_processing_defines.h',
+        'brighten.cc',
+        'brighten.h',
+        'brightness_detection.cc',
+        'brightness_detection.h',
+        'content_analysis.cc',
+        'content_analysis.h',
+        'deflickering.cc',
+        'deflickering.h',
+        'frame_preprocessor.cc',
+        'frame_preprocessor.h',
+        'spatial_resampler.cc',
+        'spatial_resampler.h',
+        'video_decimator.cc',
+        'video_decimator.h',
+        'video_processing_impl.cc',
+        'video_processing_impl.h',
       ],
       'conditions': [
         ['target_arch=="ia32" or target_arch=="x64"', {
@@ -51,7 +51,7 @@
           'target_name': 'video_processing_sse2',
           'type': 'static_library',
           'sources': [
-            'main/source/content_analysis_sse2.cc',
+            'content_analysis_sse2.cc',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {
diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.cc b/webrtc/modules/video_processing/video_processing_impl.cc
index 904cc4c7fc..898b02e8f7 100644
--- a/webrtc/modules/video_processing/main/source/video_processing_impl.cc
+++ b/webrtc/modules/video_processing/video_processing_impl.cc
@@ -7,9 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/modules/video_processing/main/source/video_processing_impl.h"
-
 #include "webrtc/base/logging.h"
+#include "webrtc/modules/video_processing/video_processing_impl.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 #include <assert.h>
diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.h b/webrtc/modules/video_processing/video_processing_impl.h
index fed5197f49..b71aa82aed 100644
--- a/webrtc/modules/video_processing/main/source/video_processing_impl.h
+++ b/webrtc/modules/video_processing/video_processing_impl.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
-#define WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_
 
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/brighten.h"
-#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
-#include "webrtc/modules/video_processing/main/source/deflickering.h"
-#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
+#include "webrtc/modules/video_processing/brighten.h"
+#include "webrtc/modules/video_processing/brightness_detection.h"
+#include "webrtc/modules/video_processing/deflickering.h"
+#include "webrtc/modules/video_processing/frame_preprocessor.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
@@ -72,4 +72,4 @@ class VideoProcessingModuleImpl : public VideoProcessingModule {
 
 }  // namespace
 
-#endif
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_
diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc
index 1f416490ae..37ea07ec93 100644
--- a/webrtc/video/video_capture_input.cc
+++ b/webrtc/video/video_capture_input.cc
@@ -16,7 +16,7 @@
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h
index 9261461f35..22a8ddc4d4 100644
--- a/webrtc/video/video_capture_input.h
+++ b/webrtc/video/video_capture_input.h
@@ -21,7 +21,7 @@
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/thread_wrapper.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index 3517a9a943..4cfd0f0ee5 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -25,7 +25,7 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h
index 44859b1cd3..b82a9b5c9f 100644
--- a/webrtc/video_engine/vie_encoder.h
+++ b/webrtc/video_engine/vie_encoder.h
@@ -22,7 +22,7 @@
 #include "webrtc/frame_callback.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video/video_capture_input.h"