diff --git a/configure.ac b/configure.ac
index 952657a..c0f1b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Revision changelog (version - date, svn rev. from upstream that was merged)
-#    0.1 - 19 Oct 2011, r766
+#    0.1 - 19 Oct 2011, r767
 AC_INIT([webrtc-audio-processing], [0.1])
 AM_INIT_AUTOMAKE([tar-ustar])
 
@@ -24,8 +24,8 @@ AS_CASE(["x${with_ns_mode}"],
 	[NS_FIXED=0])
 AM_CONDITIONAL(NS_FIXED, [test "x${NS_FIXED}" = "x1"])
 
-COMMON_CFLAGS="-DNDEBUG -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
-COMMON_CXXFLAGS="-DNDEBUG -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
+COMMON_CFLAGS="-DNDEBUG -I\$(srcdir)/interface -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
+COMMON_CXXFLAGS="-DNDEBUG -I\$(srcdir)/interface -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
 AC_SUBST([COMMON_CFLAGS])
 AC_SUBST([COMMON_CXXFLAGS])
 
diff --git a/src/modules/audio_processing/Makefile.am b/src/modules/audio_processing/Makefile.am
index e24b795..bd76942 100644
--- a/src/modules/audio_processing/Makefile.am
+++ b/src/modules/audio_processing/Makefile.am
@@ -12,42 +12,42 @@ endif
 webrtcincludedir = $(includedir)/webrtc_audio_processing
 webrtcinclude_HEADERS = $(top_srcdir)/src/typedefs.h \
 			$(top_srcdir)/src/modules/interface/module.h \
-			main/interface/audio_processing.h \
+			interface/audio_processing.h \
 			$(top_srcdir)/src/common_types.h \
 			$(top_srcdir)/src/modules/interface/module_common_types.h
 
-libwebrtc_audio_processing_la_SOURCES =  main/interface/audio_processing.h \
-					 main/source/audio_buffer.cc \
-					 main/source/audio_buffer.h \
-					 main/source/audio_processing_impl.cc \
-					 main/source/audio_processing_impl.h \
-					 main/source/echo_cancellation_impl.cc \
-					 main/source/echo_cancellation_impl.h \
-					 main/source/echo_control_mobile_impl.cc \
-					 main/source/echo_control_mobile_impl.h \
-					 main/source/gain_control_impl.cc \
-					 main/source/gain_control_impl.h \
-					 main/source/high_pass_filter_impl.cc \
-					 main/source/high_pass_filter_impl.h \
-					 main/source/level_estimator_impl.cc \
-					 main/source/level_estimator_impl.h \
-					 main/source/noise_suppression_impl.cc \
-					 main/source/noise_suppression_impl.h \
-					 main/source/splitting_filter.cc \
-					 main/source/splitting_filter.h \
-					 main/source/processing_component.cc \
-					 main/source/processing_component.h \
-					 main/source/voice_detection_impl.cc \
-					 main/source/voice_detection_impl.h
+libwebrtc_audio_processing_la_SOURCES = interface/audio_processing.h \
+					audio_buffer.cc \
+					audio_buffer.h \
+					audio_processing_impl.cc \
+					audio_processing_impl.h \
+					echo_cancellation_impl.cc \
+					echo_cancellation_impl.h \
+					echo_control_mobile_impl.cc \
+					echo_control_mobile_impl.h \
+					gain_control_impl.cc \
+					gain_control_impl.h \
+					high_pass_filter_impl.cc \
+					high_pass_filter_impl.h \
+					level_estimator_impl.cc \
+					level_estimator_impl.h \
+					noise_suppression_impl.cc \
+					noise_suppression_impl.h \
+					splitting_filter.cc \
+					splitting_filter.h \
+					processing_component.cc \
+					processing_component.h \
+					voice_detection_impl.cc \
+					voice_detection_impl.h
 libwebrtc_audio_processing_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) \
 				       -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 				       -I$(top_srcdir)/src/common_audio/vad/main/interface \
 				       -I$(top_srcdir)/src/system_wrappers/interface \
 				       -I$(top_srcdir)/src/modules/audio_processing/utility \
-				       -I$(top_srcdir)/src/modules/audio_processing/ns/main/interface \
-				       -I$(top_srcdir)/src/modules/audio_processing/aec/main/interface \
-				       -I$(top_srcdir)/src/modules/audio_processing/aecm/main/interface \
-				       -I$(top_srcdir)/src/modules/audio_processing/agc/main/interface
+				       -I$(top_srcdir)/src/modules/audio_processing/ns/interface \
+				       -I$(top_srcdir)/src/modules/audio_processing/aec/interface \
+				       -I$(top_srcdir)/src/modules/audio_processing/aecm/interface \
+				       -I$(top_srcdir)/src/modules/audio_processing/agc/interface
 libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/src/system_wrappers/libsystem_wrappers.la \
 				       $(top_builddir)/src/common_audio/signal_processing_library/libspl.la \
 				       $(top_builddir)/src/common_audio/vad/libvad.la \
diff --git a/src/modules/audio_processing/aec/Makefile.am b/src/modules/audio_processing/aec/Makefile.am
index 7663eb4..fa77479 100644
--- a/src/modules/audio_processing/aec/Makefile.am
+++ b/src/modules/audio_processing/aec/Makefile.am
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libaec.la
 
-libaec_la_SOURCES = main/interface/echo_cancellation.h \
-		    main/source/echo_cancellation.c \
-		    main/source/aec_core.h \
-		    main/source/aec_core.c \
-		    main/source/aec_core_sse2.c \
-		    main/source/aec_rdft.h \
-		    main/source/aec_rdft.c \
-		    main/source/aec_rdft_sse2.c \
-		    main/source/resampler.h \
-		    main/source/resampler.c
+libaec_la_SOURCES = interface/echo_cancellation.h \
+		    echo_cancellation.c \
+		    aec_core.h \
+		    aec_core.c \
+		    aec_core_sse2.c \
+		    aec_rdft.h \
+		    aec_rdft.c \
+		    aec_rdft_sse2.c \
+		    resampler.h \
+		    resampler.c
 libaec_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		   -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		   -I$(top_srcdir)/src/system_wrappers/interface \
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 e28104f..8a99f47 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/Makefile.am b/src/modules/audio_processing/aecm/Makefile.am
index b25fd09..5d0270b 100644
--- a/src/modules/audio_processing/aecm/Makefile.am
+++ b/src/modules/audio_processing/aecm/Makefile.am
@@ -1,9 +1,9 @@
 noinst_LTLIBRARIES = libaecm.la
 
-libaecm_la_SOURCES = main/interface/echo_control_mobile.h \
-		     main/source/echo_control_mobile.c \
-		     main/source/aecm_core.c \
-		     main/source/aecm_core.h
+libaecm_la_SOURCES = interface/echo_control_mobile.h \
+		     echo_control_mobile.c \
+		     aecm_core.c \
+		     aecm_core.h
 libaecm_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		    -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		    -I$(top_srcdir)/src/modules/audio_processing/utility
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 bbfb1ca..a4997fb 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/Makefile.am b/src/modules/audio_processing/agc/Makefile.am
index 71bbb50..e73f2e3 100644
--- a/src/modules/audio_processing/agc/Makefile.am
+++ b/src/modules/audio_processing/agc/Makefile.am
@@ -1,10 +1,10 @@
 noinst_LTLIBRARIES = libagc.la
 
-libagc_la_SOURCES = main/interface/gain_control.h \
-		    main/source/analog_agc.c \
-		    main/source/analog_agc.h \
-		    main/source/digital_agc.c \
-		    main/source/digital_agc.h
+libagc_la_SOURCES = interface/gain_control.h \
+		    analog_agc.c \
+		    analog_agc.h \
+		    digital_agc.c \
+		    digital_agc.h
 libagc_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		   -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		   -I$(top_srcdir)/src/modules/audio_processing/utility
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 f0642e7..44e7d24 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 126baae..d86ebd5 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 5cac671..a107458 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 100%
rename from src/modules/audio_processing/main/source/audio_processing_impl.cc
rename to src/modules/audio_processing/audio_processing_impl.cc
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/Makefile.am b/src/modules/audio_processing/ns/Makefile.am
index ca0dc10..f879cc1 100644
--- a/src/modules/audio_processing/ns/Makefile.am
+++ b/src/modules/audio_processing/ns/Makefile.am
@@ -1,20 +1,20 @@
 noinst_LTLIBRARIES = libns.la libns_fix.la
 
-libns_la_SOURCES = main/interface/noise_suppression.h \
-		   main/source/noise_suppression.c \
-		   main/source/windows_private.h \
-		   main/source/defines.h \
-		   main/source/ns_core.c \
-		   main/source/ns_core.h
+libns_la_SOURCES = interface/noise_suppression.h \
+		   noise_suppression.c \
+		   windows_private.h \
+		   defines.h \
+		   ns_core.c \
+		   ns_core.h
 libns_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		  -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		  -I$(top_srcdir)/src/modules/audio_processing/utility
 
-libns_fix_la_SOURCES = main/interface/noise_suppression_x.h \
-		       main/source/noise_suppression_x.c \
-		       main/source/nsx_defines.h \
-		       main/source/nsx_core.c \
-		       main/source/nsx_core.h
+libns_fix_la_SOURCES = interface/noise_suppression_x.h \
+		       noise_suppression_x.c \
+		       nsx_defines.h \
+		       nsx_core.c \
+		       nsx_core.h
 libns_fix_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		      -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		      -I$(top_srcdir)/src/modules/audio_processing/utility
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 9bdbcb9..b536b0e 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/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 130f3ee..3e3c059 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 b0609d9..2a50bc3 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