diff --git a/Android.mk b/Android.mk
index 96f135149d..57bce2f00b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,11 +23,11 @@ include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/source/Android.mk
diff --git a/src/modules/audio_processing/main/Android.mk b/src/modules/audio_processing/Android.mk
similarity index 61%
rename from src/modules/audio_processing/main/Android.mk
rename to src/modules/audio_processing/Android.mk
index a23894c3d2..4c9ebaf093 100644
--- a/src/modules/audio_processing/main/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -10,25 +10,25 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_apm
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
-    $(call all-proto-files-under, source) \
-    source/audio_buffer.cc \
-    source/audio_processing_impl.cc \
-    source/echo_cancellation_impl.cc \
-    source/echo_control_mobile_impl.cc \
-    source/gain_control_impl.cc \
-    source/high_pass_filter_impl.cc \
-    source/level_estimator_impl.cc \
-    source/noise_suppression_impl.cc \
-    source/splitting_filter.cc \
-    source/processing_component.cc \
-    source/voice_detection_impl.cc
+    $(call all-proto-files-under, .) \
+    audio_buffer.cc \
+    audio_processing_impl.cc \
+    echo_cancellation_impl.cc \
+    echo_control_mobile_impl.cc \
+    gain_control_impl.cc \
+    high_pass_filter_impl.cc \
+    level_estimator_impl.cc \
+    noise_suppression_impl.cc \
+    splitting_filter.cc \
+    processing_component.cc \
+    voice_detection_impl.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -39,15 +39,15 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
-    $(LOCAL_PATH)/../aec/main/interface \
-    $(LOCAL_PATH)/../aecm/main/interface \
-    $(LOCAL_PATH)/../agc/main/interface \
-    $(LOCAL_PATH)/../ns/main/interface \
-    $(LOCAL_PATH)/../../interface \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface \
-    $(LOCAL_PATH)/../../../common_audio/vad/main/interface \
-    $(LOCAL_PATH)/../../../system_wrappers/interface \
+    $(LOCAL_PATH)/aec/interface \
+    $(LOCAL_PATH)/aecm/interface \
+    $(LOCAL_PATH)/agc/interface \
+    $(LOCAL_PATH)/ns/interface \
+    $(LOCAL_PATH)/../interface \
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../common_audio/signal_processing_library/main/interface \
+    $(LOCAL_PATH)/../../common_audio/vad/main/interface \
+    $(LOCAL_PATH)/../../system_wrappers/interface \
     external/protobuf/src
 
 LOCAL_SHARED_LIBRARIES := \
@@ -67,8 +67,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
-    $(call all-proto-files-under, source) \
-    test/process_test/process_test.cc
+    $(call all-proto-files-under, .) \
+    test/process_test.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -76,9 +76,9 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
-    $(LOCAL_PATH)/../../interface \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../system_wrappers/interface \
+    $(LOCAL_PATH)/../interface \
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../system_wrappers/interface \
     external/gtest/include
 
 LOCAL_STATIC_LIBRARIES := \
@@ -106,8 +106,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
-    $(call all-proto-files-under, test/unit_test) \
-    test/unit_test/unit_test.cc
+    $(call all-proto-files-under, test) \
+    test/unit_test.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -116,10 +116,10 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
-    $(LOCAL_PATH)/../../interface \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../system_wrappers/interface \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface \
+    $(LOCAL_PATH)/../interface \
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../system_wrappers/interface \
+    $(LOCAL_PATH)/../../common_audio/signal_processing_library/main/interface \
     external/gtest/include \
     external/protobuf/src
 
diff --git a/src/modules/audio_processing/aec/main/source/Android.mk b/src/modules/audio_processing/aec/Android.mk
similarity index 79%
rename from src/modules/audio_processing/aec/main/source/Android.mk
rename to src/modules/audio_processing/aec/Android.mk
index 86df675162..f2dd96d1b0 100644
--- a/src/modules/audio_processing/aec/main/source/Android.mk
+++ b/src/modules/audio_processing/aec/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aec
@@ -29,10 +29,10 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../utility \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/interface \
+    $(LOCAL_PATH)/../utility \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_processing/aec/main/source/aec.gypi b/src/modules/audio_processing/aec/aec.gypi
similarity index 82%
rename from src/modules/audio_processing/aec/main/source/aec.gypi
rename to src/modules/audio_processing/aec/aec.gypi
index e28104f0de..8a99f4739f 100644
--- a/src/modules/audio_processing/aec/main/source/aec.gypi
+++ b/src/modules/audio_processing/aec/aec.gypi
@@ -16,15 +16,15 @@
         'apm_util'
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/echo_cancellation.h',
+        'interface/echo_cancellation.h',
         'echo_cancellation.c',
         'aec_core.h',
         'aec_core.c',
@@ -38,9 +38,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/aec/main/source/aec_core.c b/src/modules/audio_processing/aec/aec_core.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_core.c
rename to src/modules/audio_processing/aec/aec_core.c
diff --git a/src/modules/audio_processing/aec/main/source/aec_core.h b/src/modules/audio_processing/aec/aec_core.h
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_core.h
rename to src/modules/audio_processing/aec/aec_core.h
diff --git a/src/modules/audio_processing/aec/main/source/aec_core_sse2.c b/src/modules/audio_processing/aec/aec_core_sse2.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_core_sse2.c
rename to src/modules/audio_processing/aec/aec_core_sse2.c
diff --git a/src/modules/audio_processing/aec/main/source/aec_rdft.c b/src/modules/audio_processing/aec/aec_rdft.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_rdft.c
rename to src/modules/audio_processing/aec/aec_rdft.c
diff --git a/src/modules/audio_processing/aec/main/source/aec_rdft.h b/src/modules/audio_processing/aec/aec_rdft.h
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_rdft.h
rename to src/modules/audio_processing/aec/aec_rdft.h
diff --git a/src/modules/audio_processing/aec/main/source/aec_rdft_sse2.c b/src/modules/audio_processing/aec/aec_rdft_sse2.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/aec_rdft_sse2.c
rename to src/modules/audio_processing/aec/aec_rdft_sse2.c
diff --git a/src/modules/audio_processing/aec/main/source/echo_cancellation.c b/src/modules/audio_processing/aec/echo_cancellation.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/echo_cancellation.c
rename to src/modules/audio_processing/aec/echo_cancellation.c
diff --git a/src/modules/audio_processing/aec/main/interface/echo_cancellation.h b/src/modules/audio_processing/aec/interface/echo_cancellation.h
similarity index 100%
rename from src/modules/audio_processing/aec/main/interface/echo_cancellation.h
rename to src/modules/audio_processing/aec/interface/echo_cancellation.h
diff --git a/src/modules/audio_processing/aec/main/source/resampler.c b/src/modules/audio_processing/aec/resampler.c
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/resampler.c
rename to src/modules/audio_processing/aec/resampler.c
diff --git a/src/modules/audio_processing/aec/main/source/resampler.h b/src/modules/audio_processing/aec/resampler.h
similarity index 100%
rename from src/modules/audio_processing/aec/main/source/resampler.h
rename to src/modules/audio_processing/aec/resampler.h
diff --git a/src/modules/audio_processing/aecm/main/source/Android.mk b/src/modules/audio_processing/aecm/Android.mk
similarity index 80%
rename from src/modules/audio_processing/aecm/main/source/Android.mk
rename to src/modules/audio_processing/aecm/Android.mk
index 7dce06b17e..ade63cf10a 100644
--- a/src/modules/audio_processing/aecm/main/source/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -32,10 +32,10 @@ LOCAL_CFLAGS += \
 endif
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../utility \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/interface \
+    $(LOCAL_PATH)/../utility \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_processing/aecm/main/source/aecm.gypi b/src/modules/audio_processing/aecm/aecm.gypi
similarity index 80%
rename from src/modules/audio_processing/aecm/main/source/aecm.gypi
rename to src/modules/audio_processing/aecm/aecm.gypi
index bbfb1ca82c..a4997fba97 100644
--- a/src/modules/audio_processing/aecm/main/source/aecm.gypi
+++ b/src/modules/audio_processing/aecm/aecm.gypi
@@ -16,15 +16,15 @@
         'apm_util'
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/echo_control_mobile.h',
+        'interface/echo_control_mobile.h',
         'echo_control_mobile.c',
         'aecm_core.c',
         'aecm_core.h',
@@ -32,9 +32,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/aecm/main/source/aecm_core.c b/src/modules/audio_processing/aecm/aecm_core.c
similarity index 100%
rename from src/modules/audio_processing/aecm/main/source/aecm_core.c
rename to src/modules/audio_processing/aecm/aecm_core.c
diff --git a/src/modules/audio_processing/aecm/main/source/aecm_core.h b/src/modules/audio_processing/aecm/aecm_core.h
similarity index 100%
rename from src/modules/audio_processing/aecm/main/source/aecm_core.h
rename to src/modules/audio_processing/aecm/aecm_core.h
diff --git a/src/modules/audio_processing/aecm/main/source/aecm_core_neon.c b/src/modules/audio_processing/aecm/aecm_core_neon.c
similarity index 100%
rename from src/modules/audio_processing/aecm/main/source/aecm_core_neon.c
rename to src/modules/audio_processing/aecm/aecm_core_neon.c
diff --git a/src/modules/audio_processing/aecm/main/source/echo_control_mobile.c b/src/modules/audio_processing/aecm/echo_control_mobile.c
similarity index 100%
rename from src/modules/audio_processing/aecm/main/source/echo_control_mobile.c
rename to src/modules/audio_processing/aecm/echo_control_mobile.c
diff --git a/src/modules/audio_processing/aecm/main/interface/echo_control_mobile.h b/src/modules/audio_processing/aecm/interface/echo_control_mobile.h
similarity index 100%
rename from src/modules/audio_processing/aecm/main/interface/echo_control_mobile.h
rename to src/modules/audio_processing/aecm/interface/echo_control_mobile.h
diff --git a/src/modules/audio_processing/agc/main/source/Android.mk b/src/modules/audio_processing/agc/Android.mk
similarity index 80%
rename from src/modules/audio_processing/agc/main/source/Android.mk
rename to src/modules/audio_processing/agc/Android.mk
index 623fc9f8c7..1bee4d2d0e 100644
--- a/src/modules/audio_processing/agc/main/source/Android.mk
+++ b/src/modules/audio_processing/agc/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -25,9 +25,9 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/interface \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_processing/agc/main/source/agc.gypi b/src/modules/audio_processing/agc/agc.gypi
similarity index 80%
rename from src/modules/audio_processing/agc/main/source/agc.gypi
rename to src/modules/audio_processing/agc/agc.gypi
index f0642e7353..44e7d24552 100644
--- a/src/modules/audio_processing/agc/main/source/agc.gypi
+++ b/src/modules/audio_processing/agc/agc.gypi
@@ -15,15 +15,15 @@
         '<(webrtc_root)/common_audio/common_audio.gyp:spl',
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/gain_control.h',
+        'interface/gain_control.h',
         'analog_agc.c',
         'analog_agc.h',
         'digital_agc.c',
@@ -32,9 +32,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/agc/main/source/analog_agc.c b/src/modules/audio_processing/agc/analog_agc.c
similarity index 100%
rename from src/modules/audio_processing/agc/main/source/analog_agc.c
rename to src/modules/audio_processing/agc/analog_agc.c
diff --git a/src/modules/audio_processing/agc/main/source/analog_agc.h b/src/modules/audio_processing/agc/analog_agc.h
similarity index 100%
rename from src/modules/audio_processing/agc/main/source/analog_agc.h
rename to src/modules/audio_processing/agc/analog_agc.h
diff --git a/src/modules/audio_processing/agc/main/source/digital_agc.c b/src/modules/audio_processing/agc/digital_agc.c
similarity index 100%
rename from src/modules/audio_processing/agc/main/source/digital_agc.c
rename to src/modules/audio_processing/agc/digital_agc.c
diff --git a/src/modules/audio_processing/agc/main/source/digital_agc.h b/src/modules/audio_processing/agc/digital_agc.h
similarity index 100%
rename from src/modules/audio_processing/agc/main/source/digital_agc.h
rename to src/modules/audio_processing/agc/digital_agc.h
diff --git a/src/modules/audio_processing/agc/main/interface/gain_control.h b/src/modules/audio_processing/agc/interface/gain_control.h
similarity index 100%
rename from src/modules/audio_processing/agc/main/interface/gain_control.h
rename to src/modules/audio_processing/agc/interface/gain_control.h
diff --git a/src/modules/audio_processing/main/apm_tests.gypi b/src/modules/audio_processing/apm_tests.gypi
similarity index 85%
rename from src/modules/audio_processing/main/apm_tests.gypi
rename to src/modules/audio_processing/apm_tests.gypi
index 126baae74e..d86ebd5c4a 100644
--- a/src/modules/audio_processing/main/apm_tests.gypi
+++ b/src/modules/audio_processing/apm_tests.gypi
@@ -29,15 +29,14 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/../test/test.gyp:test_support',
         '<(webrtc_root)/../testing/gtest.gyp:gtest',
-        '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
         '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
       ],
       'include_dirs': [
-        '../../../../testing/gtest/include',
+        '<(webrtc_root)/../testing/gtest/include',
         '<(protoc_out_dir)',
       ],
       'sources': [
-        'test/unit_test/unit_test.cc',
+        'test/unit_test.cc',
         '<(protoc_out_dir)/<(protoc_out_relpath)/unittest.pb.cc',
         '<(protoc_out_dir)/<(protoc_out_relpath)/unittest.pb.h',
       ],
@@ -48,7 +47,7 @@
       'type': 'none',
       'variables': {
         'proto_relpath':
-          '<(webrtc_root)/modules/audio_processing/main/test/unit_test',
+          '<(webrtc_root)/modules/audio_processing/test',
       },
       'sources': [
         '<(proto_relpath)/unittest.proto',
@@ -74,7 +73,7 @@
         },
       ],
       'dependencies': [
-        '../../third_party/protobuf/protobuf.gyp:protoc#host',
+        '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protoc#host',
       ],
       # This target exports a hard dependency because it generates header
       # files.
@@ -87,22 +86,15 @@
         'audio_processing',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/../testing/gtest.gyp:gtest',
-        '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
         '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
       ],
       'include_dirs': [
-        '../../../../testing/gtest/include',
+        '<(webrtc_root)/../testing/gtest/include',
         '<(protoc_out_dir)',
       ],
       'sources': [
-        'test/process_test/process_test.cc',
+        'test/process_test.cc',
       ],
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/main/source/audio_buffer.cc b/src/modules/audio_processing/audio_buffer.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/audio_buffer.cc
rename to src/modules/audio_processing/audio_buffer.cc
diff --git a/src/modules/audio_processing/main/source/audio_buffer.h b/src/modules/audio_processing/audio_buffer.h
similarity index 100%
rename from src/modules/audio_processing/main/source/audio_buffer.h
rename to src/modules/audio_processing/audio_buffer.h
diff --git a/src/modules/audio_processing/main/source/apm.gypi b/src/modules/audio_processing/audio_processing.gypi
similarity index 87%
rename from src/modules/audio_processing/main/source/apm.gypi
rename to src/modules/audio_processing/audio_processing.gypi
index 5cac671d75..a10745881f 100644
--- a/src/modules/audio_processing/main/source/apm.gypi
+++ b/src/modules/audio_processing/audio_processing.gypi
@@ -25,11 +25,11 @@
         }],
         ['build_with_chromium==1', {
           'dependencies': [
-            '../../protobuf/protobuf.gyp:protobuf_lite',
+            '<(webrtc_root)/../protobuf/protobuf.gyp:protobuf_lite',
           ],
         }, {
           'dependencies': [
-            '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+            '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
           ],
         }],
       ],
@@ -43,18 +43,18 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
+        'interface',
         '../interface',
-        '../../../interface',
         '<(protoc_out_dir)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
+          'interface',
           '../interface',
-          '../../../interface',
         ],
       },
       'sources': [
-        '../interface/audio_processing.h',
+        'interface/audio_processing.h',
         'audio_buffer.cc',
         'audio_buffer.h',
         'audio_processing_impl.cc',
@@ -86,7 +86,7 @@
       'target_name': 'debug_proto',
       'type': 'none',
       'variables': {
-        'proto_relpath': 'audio_processing/main/source/',
+        'proto_relpath': '<(webrtc_root)/modules/audio_processing',
       },
       'sources': [
         '<(proto_relpath)/debug.proto',
@@ -114,11 +114,11 @@
       'conditions': [
         ['build_with_chromium==1', {
           'dependencies': [
-            '../../protobuf/protobuf.gyp:protoc#host',
+            '<(webrtc_root)/../protobuf/protobuf.gyp:protoc#host',
           ],
         }, {
           'dependencies': [
-            '../../third_party/protobuf/protobuf.gyp:protoc#host',
+            '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protoc#host',
           ],
         }],
       ],
@@ -128,9 +128,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/main/source/audio_processing_impl.cc b/src/modules/audio_processing/audio_processing_impl.cc
similarity index 99%
rename from src/modules/audio_processing/main/source/audio_processing_impl.cc
rename to src/modules/audio_processing/audio_processing_impl.cc
index b1464e12a4..da8dcdb276 100644
--- a/src/modules/audio_processing/main/source/audio_processing_impl.cc
+++ b/src/modules/audio_processing/audio_processing_impl.cc
@@ -26,7 +26,7 @@
 #include "splitting_filter.h"
 #include "voice_detection_impl.h"
 #ifdef WEBRTC_ANDROID
-#include "external/webrtc/src/modules/audio_processing/main/source/debug.pb.h"
+#include "external/webrtc/src/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/audio_processing/debug.pb.h"
 #endif
diff --git a/src/modules/audio_processing/main/source/audio_processing_impl.h b/src/modules/audio_processing/audio_processing_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/audio_processing_impl.h
rename to src/modules/audio_processing/audio_processing_impl.h
diff --git a/src/modules/audio_processing/main/source/debug.proto b/src/modules/audio_processing/debug.proto
similarity index 100%
rename from src/modules/audio_processing/main/source/debug.proto
rename to src/modules/audio_processing/debug.proto
diff --git a/src/modules/audio_processing/main/source/echo_cancellation_impl.cc b/src/modules/audio_processing/echo_cancellation_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/echo_cancellation_impl.cc
rename to src/modules/audio_processing/echo_cancellation_impl.cc
diff --git a/src/modules/audio_processing/main/source/echo_cancellation_impl.h b/src/modules/audio_processing/echo_cancellation_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/echo_cancellation_impl.h
rename to src/modules/audio_processing/echo_cancellation_impl.h
diff --git a/src/modules/audio_processing/main/source/echo_control_mobile_impl.cc b/src/modules/audio_processing/echo_control_mobile_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/echo_control_mobile_impl.cc
rename to src/modules/audio_processing/echo_control_mobile_impl.cc
diff --git a/src/modules/audio_processing/main/source/echo_control_mobile_impl.h b/src/modules/audio_processing/echo_control_mobile_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/echo_control_mobile_impl.h
rename to src/modules/audio_processing/echo_control_mobile_impl.h
diff --git a/src/modules/audio_processing/main/source/gain_control_impl.cc b/src/modules/audio_processing/gain_control_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/gain_control_impl.cc
rename to src/modules/audio_processing/gain_control_impl.cc
diff --git a/src/modules/audio_processing/main/source/gain_control_impl.h b/src/modules/audio_processing/gain_control_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/gain_control_impl.h
rename to src/modules/audio_processing/gain_control_impl.h
diff --git a/src/modules/audio_processing/main/source/high_pass_filter_impl.cc b/src/modules/audio_processing/high_pass_filter_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/high_pass_filter_impl.cc
rename to src/modules/audio_processing/high_pass_filter_impl.cc
diff --git a/src/modules/audio_processing/main/source/high_pass_filter_impl.h b/src/modules/audio_processing/high_pass_filter_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/high_pass_filter_impl.h
rename to src/modules/audio_processing/high_pass_filter_impl.h
diff --git a/src/modules/audio_processing/main/interface/audio_processing.h b/src/modules/audio_processing/interface/audio_processing.h
similarity index 100%
rename from src/modules/audio_processing/main/interface/audio_processing.h
rename to src/modules/audio_processing/interface/audio_processing.h
diff --git a/src/modules/audio_processing/main/source/level_estimator_impl.cc b/src/modules/audio_processing/level_estimator_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/level_estimator_impl.cc
rename to src/modules/audio_processing/level_estimator_impl.cc
diff --git a/src/modules/audio_processing/main/source/level_estimator_impl.h b/src/modules/audio_processing/level_estimator_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/level_estimator_impl.h
rename to src/modules/audio_processing/level_estimator_impl.h
diff --git a/src/modules/audio_processing/main/source/noise_suppression_impl.cc b/src/modules/audio_processing/noise_suppression_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/noise_suppression_impl.cc
rename to src/modules/audio_processing/noise_suppression_impl.cc
diff --git a/src/modules/audio_processing/main/source/noise_suppression_impl.h b/src/modules/audio_processing/noise_suppression_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/noise_suppression_impl.h
rename to src/modules/audio_processing/noise_suppression_impl.h
diff --git a/src/modules/audio_processing/ns/main/source/Android.mk b/src/modules/audio_processing/ns/Android.mk
similarity index 81%
rename from src/modules/audio_processing/ns/main/source/Android.mk
rename to src/modules/audio_processing/ns/Android.mk
index 19b6722884..25f53468c0 100644
--- a/src/modules/audio_processing/ns/main/source/Android.mk
+++ b/src/modules/audio_processing/ns/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_ns
@@ -35,10 +35,10 @@ LOCAL_CFLAGS += \
 endif
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../utility \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/interface \
+    $(LOCAL_PATH)/../utility \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_processing/ns/main/source/defines.h b/src/modules/audio_processing/ns/defines.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/defines.h
rename to src/modules/audio_processing/ns/defines.h
diff --git a/src/modules/audio_processing/ns/main/interface/noise_suppression.h b/src/modules/audio_processing/ns/interface/noise_suppression.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/interface/noise_suppression.h
rename to src/modules/audio_processing/ns/interface/noise_suppression.h
diff --git a/src/modules/audio_processing/ns/main/interface/noise_suppression_x.h b/src/modules/audio_processing/ns/interface/noise_suppression_x.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/interface/noise_suppression_x.h
rename to src/modules/audio_processing/ns/interface/noise_suppression_x.h
diff --git a/src/modules/audio_processing/ns/main/source/noise_suppression.c b/src/modules/audio_processing/ns/noise_suppression.c
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/noise_suppression.c
rename to src/modules/audio_processing/ns/noise_suppression.c
diff --git a/src/modules/audio_processing/ns/main/source/noise_suppression_x.c b/src/modules/audio_processing/ns/noise_suppression_x.c
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/noise_suppression_x.c
rename to src/modules/audio_processing/ns/noise_suppression_x.c
diff --git a/src/modules/audio_processing/ns/main/source/ns.gypi b/src/modules/audio_processing/ns/ns.gypi
similarity index 81%
rename from src/modules/audio_processing/ns/main/source/ns.gypi
rename to src/modules/audio_processing/ns/ns.gypi
index 9bdbcb9d0b..b536b0e7c5 100644
--- a/src/modules/audio_processing/ns/main/source/ns.gypi
+++ b/src/modules/audio_processing/ns/ns.gypi
@@ -16,15 +16,15 @@
         'apm_util'
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/noise_suppression.h',
+        'interface/noise_suppression.h',
         'noise_suppression.c',
         'windows_private.h',
         'defines.h',
@@ -39,15 +39,15 @@
         '<(webrtc_root)/common_audio/common_audio.gyp:spl',
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/noise_suppression_x.h',
+        'interface/noise_suppression_x.h',
         'noise_suppression_x.c',
         'nsx_defines.h',
         'nsx_core.c',
@@ -56,9 +56,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_processing/ns/main/source/ns_core.c b/src/modules/audio_processing/ns/ns_core.c
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/ns_core.c
rename to src/modules/audio_processing/ns/ns_core.c
diff --git a/src/modules/audio_processing/ns/main/source/ns_core.h b/src/modules/audio_processing/ns/ns_core.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/ns_core.h
rename to src/modules/audio_processing/ns/ns_core.h
diff --git a/src/modules/audio_processing/ns/main/source/nsx_core.c b/src/modules/audio_processing/ns/nsx_core.c
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/nsx_core.c
rename to src/modules/audio_processing/ns/nsx_core.c
diff --git a/src/modules/audio_processing/ns/main/source/nsx_core.h b/src/modules/audio_processing/ns/nsx_core.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/nsx_core.h
rename to src/modules/audio_processing/ns/nsx_core.h
diff --git a/src/modules/audio_processing/ns/main/source/nsx_core_neon.c b/src/modules/audio_processing/ns/nsx_core_neon.c
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/nsx_core_neon.c
rename to src/modules/audio_processing/ns/nsx_core_neon.c
diff --git a/src/modules/audio_processing/ns/main/source/nsx_defines.h b/src/modules/audio_processing/ns/nsx_defines.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/nsx_defines.h
rename to src/modules/audio_processing/ns/nsx_defines.h
diff --git a/src/modules/audio_processing/ns/main/source/windows_private.h b/src/modules/audio_processing/ns/windows_private.h
similarity index 100%
rename from src/modules/audio_processing/ns/main/source/windows_private.h
rename to src/modules/audio_processing/ns/windows_private.h
diff --git a/src/modules/audio_processing/main/source/processing_component.cc b/src/modules/audio_processing/processing_component.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/processing_component.cc
rename to src/modules/audio_processing/processing_component.cc
diff --git a/src/modules/audio_processing/main/source/processing_component.h b/src/modules/audio_processing/processing_component.h
similarity index 100%
rename from src/modules/audio_processing/main/source/processing_component.h
rename to src/modules/audio_processing/processing_component.h
diff --git a/src/modules/audio_processing/main/source/splitting_filter.cc b/src/modules/audio_processing/splitting_filter.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/splitting_filter.cc
rename to src/modules/audio_processing/splitting_filter.cc
diff --git a/src/modules/audio_processing/main/source/splitting_filter.h b/src/modules/audio_processing/splitting_filter.h
similarity index 100%
rename from src/modules/audio_processing/main/source/splitting_filter.h
rename to src/modules/audio_processing/splitting_filter.h
diff --git a/src/modules/audio_processing/main/test/android/apmtest/AndroidManifest.xml b/src/modules/audio_processing/test/android/apmtest/AndroidManifest.xml
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/AndroidManifest.xml
rename to src/modules/audio_processing/test/android/apmtest/AndroidManifest.xml
diff --git a/src/modules/audio_processing/main/test/android/apmtest/default.properties b/src/modules/audio_processing/test/android/apmtest/default.properties
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/default.properties
rename to src/modules/audio_processing/test/android/apmtest/default.properties
diff --git a/src/modules/audio_processing/main/test/android/apmtest/jni/Android.mk b/src/modules/audio_processing/test/android/apmtest/jni/Android.mk
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/jni/Android.mk
rename to src/modules/audio_processing/test/android/apmtest/jni/Android.mk
diff --git a/src/modules/audio_processing/main/test/android/apmtest/jni/Application.mk b/src/modules/audio_processing/test/android/apmtest/jni/Application.mk
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/jni/Application.mk
rename to src/modules/audio_processing/test/android/apmtest/jni/Application.mk
diff --git a/src/modules/audio_processing/main/test/android/apmtest/jni/main.c b/src/modules/audio_processing/test/android/apmtest/jni/main.c
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/jni/main.c
rename to src/modules/audio_processing/test/android/apmtest/jni/main.c
diff --git a/src/modules/audio_processing/main/test/android/apmtest/res/values/strings.xml b/src/modules/audio_processing/test/android/apmtest/res/values/strings.xml
similarity index 100%
rename from src/modules/audio_processing/main/test/android/apmtest/res/values/strings.xml
rename to src/modules/audio_processing/test/android/apmtest/res/values/strings.xml
diff --git a/src/modules/audio_processing/main/test/process_test/apmtest.m b/src/modules/audio_processing/test/apmtest.m
similarity index 100%
rename from src/modules/audio_processing/main/test/process_test/apmtest.m
rename to src/modules/audio_processing/test/apmtest.m
diff --git a/src/modules/audio_processing/main/test/process_test/process_test.cc b/src/modules/audio_processing/test/process_test.cc
similarity index 99%
rename from src/modules/audio_processing/main/test/process_test/process_test.cc
rename to src/modules/audio_processing/test/process_test.cc
index 130f3ee59e..3e3c05968b 100644
--- a/src/modules/audio_processing/main/test/process_test/process_test.cc
+++ b/src/modules/audio_processing/test/process_test.cc
@@ -21,7 +21,7 @@
 #include "module_common_types.h"
 #include "tick_util.h"
 #ifdef WEBRTC_ANDROID
-#include "external/webrtc/src/modules/audio_processing/main/source/debug.pb.h"
+#include "external/webrtc/src/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/audio_processing/debug.pb.h"
 #endif
diff --git a/src/modules/audio_processing/main/test/unit_test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc
similarity index 99%
rename from src/modules/audio_processing/main/test/unit_test/unit_test.cc
rename to src/modules/audio_processing/test/unit_test.cc
index b0609d9bb0..2a50bc37ea 100644
--- a/src/modules/audio_processing/main/test/unit_test/unit_test.cc
+++ b/src/modules/audio_processing/test/unit_test.cc
@@ -20,7 +20,7 @@
 #include "thread_wrapper.h"
 #include "trace.h"
 #ifdef WEBRTC_ANDROID
-#include "external/webrtc/src/modules/audio_processing/main/test/unit_test/unittest.pb.h"
+#include "external/webrtc/src/modules/audio_processing/test/unittest.pb.h"
 #else
 #include "webrtc/audio_processing/unittest.pb.h"
 #endif
diff --git a/src/modules/audio_processing/main/test/unit_test/unittest.proto b/src/modules/audio_processing/test/unittest.proto
similarity index 100%
rename from src/modules/audio_processing/main/test/unit_test/unittest.proto
rename to src/modules/audio_processing/test/unittest.proto
diff --git a/src/modules/audio_processing/main/source/voice_detection_impl.cc b/src/modules/audio_processing/voice_detection_impl.cc
similarity index 100%
rename from src/modules/audio_processing/main/source/voice_detection_impl.cc
rename to src/modules/audio_processing/voice_detection_impl.cc
diff --git a/src/modules/audio_processing/main/source/voice_detection_impl.h b/src/modules/audio_processing/voice_detection_impl.h
similarity index 100%
rename from src/modules/audio_processing/main/source/voice_detection_impl.h
rename to src/modules/audio_processing/voice_detection_impl.h
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index 248a17fd10..88ff3c6334 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -20,12 +20,12 @@
     'audio_coding/NetEQ/main/source/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
     'audio_device/main/source/audio_device.gypi',
+    'audio_processing/audio_processing.gypi',
+    'audio_processing/aec/aec.gypi',
+    'audio_processing/aecm/aecm.gypi',
+    'audio_processing/agc/agc.gypi',
+    'audio_processing/ns/ns.gypi',
     'audio_processing/utility/util.gypi',
-    'audio_processing/ns/main/source/ns.gypi',
-    'audio_processing/agc/main/source/agc.gypi',
-    'audio_processing/main/source/apm.gypi',
-    'audio_processing/aec/main/source/aec.gypi',
-    'audio_processing/aecm/main/source/aecm.gypi',
     'media_file/source/media_file.gypi',
     'udp_transport/source/udp_transport.gypi',
     'utility/source/utility.gypi',
@@ -47,7 +47,7 @@
         'audio_coding/codecs/iSAC/isac_test.gypi',
         'audio_coding/codecs/iSAC/isacfix_test.gypi',
         'audio_coding/NetEQ/main/neteq_tests.gypi',
-        'audio_processing/main/apm_tests.gypi',
+        'audio_processing/apm_tests.gypi',
         'rtp_rtcp/source/rtp_rtcp_tests.gypi',
         'rtp_rtcp/test/test_bwe/test_bwe.gypi',
         'rtp_rtcp/test/testFec/test_fec.gypi',
diff --git a/src/voice_engine/main/source/Android.mk b/src/voice_engine/main/source/Android.mk
index d476575645..840572fc64 100644
--- a/src/voice_engine/main/source/Android.mk
+++ b/src/voice_engine/main/source/Android.mk
@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../modules/audio_conference_mixer/interface \
     $(LOCAL_PATH)/../../../modules/audio_device/main/interface \
     $(LOCAL_PATH)/../../../modules/audio_device/main/source \
-    $(LOCAL_PATH)/../../../modules/audio_processing/main/interface \
+    $(LOCAL_PATH)/../../../modules/audio_processing/interface \
     $(LOCAL_PATH)/../../../modules/media_file/interface \
     $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \
     $(LOCAL_PATH)/../../../modules/udp_transport/interface \