diff --git a/src/modules/audio_device/main/source/Android.mk b/src/modules/audio_device/Android.mk
similarity index 100%
rename from src/modules/audio_device/main/source/Android.mk
rename to src/modules/audio_device/Android.mk
diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc b/src/modules/audio_device/android/audio_device_android_jni.cc
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_android_jni.cc
rename to src/modules/audio_device/android/audio_device_android_jni.cc
diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.h b/src/modules/audio_device/android/audio_device_android_jni.h
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_android_jni.h
rename to src/modules/audio_device/android/audio_device_android_jni.h
diff --git a/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc b/src/modules/audio_device/android/audio_device_android_opensles.cc
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_android_opensles.cc
rename to src/modules/audio_device/android/audio_device_android_opensles.cc
diff --git a/src/modules/audio_device/main/source/android/audio_device_android_opensles.h b/src/modules/audio_device/android/audio_device_android_opensles.h
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_android_opensles.h
rename to src/modules/audio_device/android/audio_device_android_opensles.h
diff --git a/src/modules/audio_device/main/source/android/audio_device_utility_android.cc b/src/modules/audio_device/android/audio_device_utility_android.cc
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_utility_android.cc
rename to src/modules/audio_device/android/audio_device_utility_android.cc
diff --git a/src/modules/audio_device/main/source/android/audio_device_utility_android.h b/src/modules/audio_device/android/audio_device_utility_android.h
similarity index 100%
rename from src/modules/audio_device/main/source/android/audio_device_utility_android.h
rename to src/modules/audio_device/android/audio_device_utility_android.h
diff --git a/src/modules/audio_device/main/source/android/org/webrtc/voiceengine/AudioDeviceAndroid.java b/src/modules/audio_device/android/org/webrtc/voiceengine/AudioDeviceAndroid.java
similarity index 100%
rename from src/modules/audio_device/main/source/android/org/webrtc/voiceengine/AudioDeviceAndroid.java
rename to src/modules/audio_device/android/org/webrtc/voiceengine/AudioDeviceAndroid.java
diff --git a/src/modules/audio_device/main/source/audio_device.gypi b/src/modules/audio_device/audio_device.gypi
similarity index 91%
rename from src/modules/audio_device/main/source/audio_device.gypi
rename to src/modules/audio_device/audio_device.gypi
index 2755c4ed89..b8f77ea4b2 100644
--- a/src/modules/audio_device/main/source/audio_device.gypi
+++ b/src/modules/audio_device/audio_device.gypi
@@ -18,21 +18,20 @@
       ],
       'include_dirs': [
         '.',
-        '../../../interface',
         '../interface',
+        'include',
         'dummy', # dummy audio device
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../../../../',
-          '../../../interface',
           '../interface',
+          'include',
         ],
       },
       # TODO(xians): Rename files to e.g. *_linux.{ext}, remove sources in conditions section
       'sources': [
-        '../interface/audio_device.h',
-        '../interface/audio_device_defines.h',
+        'include/audio_device.h',
+        'include/audio_device_defines.h',
         'audio_device_buffer.cc',
         'audio_device_buffer.h',
         'audio_device_generic.cc',
@@ -64,13 +63,12 @@
         ['OS=="win"', {
           'include_dirs': [
             'win',
-            '../../../../../..',
           ],
         }],
         ['OS=="android"', {
-            'include_dirs': [
-              'android',
-            ],
+          'include_dirs': [
+            'android',
+          ],
         }], # OS==android
         ['include_internal_audio_device==0', {
           'defines': [
@@ -198,8 +196,8 @@
             '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
           ],
           'sources': [
-            '../test/audio_device_test_api.cc',
-            '../test/audio_device_test_defines.h',
+            'test/audio_device_test_api.cc',
+            'test/audio_device_test_defines.h',
           ],
         },
         {
@@ -214,10 +212,10 @@
             '<(DEPTH)/testing/gtest.gyp:gtest',
           ],
           'sources': [
-            '../test/audio_device_test_func.cc',
-            '../test/audio_device_test_defines.h',
-            '../test/func_test_manager.cc',
-            '../test/func_test_manager.h',
+            'test/audio_device_test_func.cc',
+            'test/audio_device_test_defines.h',
+            'test/func_test_manager.cc',
+            'test/func_test_manager.h',
           ],
         },
       ],
@@ -225,8 +223,3 @@
   ],
 }
 
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_device/main/source/audio_device_buffer.cc b/src/modules/audio_device/audio_device_buffer.cc
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_buffer.cc
rename to src/modules/audio_device/audio_device_buffer.cc
diff --git a/src/modules/audio_device/main/source/audio_device_buffer.h b/src/modules/audio_device/audio_device_buffer.h
similarity index 98%
rename from src/modules/audio_device/main/source/audio_device_buffer.h
rename to src/modules/audio_device/audio_device_buffer.h
index 4bc374a373..b7c4fc85a9 100644
--- a/src/modules/audio_device/main/source/audio_device_buffer.h
+++ b/src/modules/audio_device/audio_device_buffer.h
@@ -12,7 +12,7 @@
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
 
 #include "typedefs.h"
-#include "../../../../common_audio/resampler/include/resampler.h"
+#include "common_audio/resampler/include/resampler.h"
 #include "file_wrapper.h"
 #include "audio_device.h"
 #include "list_wrapper.h"
diff --git a/src/modules/audio_device/main/source/audio_device_config.h b/src/modules/audio_device/audio_device_config.h
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_config.h
rename to src/modules/audio_device/audio_device_config.h
diff --git a/src/modules/audio_device/main/source/audio_device_generic.cc b/src/modules/audio_device/audio_device_generic.cc
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_generic.cc
rename to src/modules/audio_device/audio_device_generic.cc
diff --git a/src/modules/audio_device/main/source/audio_device_generic.h b/src/modules/audio_device/audio_device_generic.h
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_generic.h
rename to src/modules/audio_device/audio_device_generic.h
diff --git a/src/modules/audio_device/main/source/audio_device_impl.cc b/src/modules/audio_device/audio_device_impl.cc
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_impl.cc
rename to src/modules/audio_device/audio_device_impl.cc
diff --git a/src/modules/audio_device/main/source/audio_device_impl.h b/src/modules/audio_device/audio_device_impl.h
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_impl.h
rename to src/modules/audio_device/audio_device_impl.h
diff --git a/src/modules/audio_device/main/source/audio_device_utility.cc b/src/modules/audio_device/audio_device_utility.cc
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_utility.cc
rename to src/modules/audio_device/audio_device_utility.cc
diff --git a/src/modules/audio_device/main/source/audio_device_utility.h b/src/modules/audio_device/audio_device_utility.h
similarity index 100%
rename from src/modules/audio_device/main/source/audio_device_utility.h
rename to src/modules/audio_device/audio_device_utility.h
diff --git a/src/modules/audio_device/main/source/dummy/audio_device_dummy.h b/src/modules/audio_device/dummy/audio_device_dummy.h
similarity index 100%
rename from src/modules/audio_device/main/source/dummy/audio_device_dummy.h
rename to src/modules/audio_device/dummy/audio_device_dummy.h
diff --git a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h b/src/modules/audio_device/dummy/audio_device_utility_dummy.h
similarity index 100%
rename from src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h
rename to src/modules/audio_device/dummy/audio_device_utility_dummy.h
diff --git a/src/modules/audio_device/main/interface/audio_device.h b/src/modules/audio_device/include/audio_device.h
similarity index 99%
rename from src/modules/audio_device/main/interface/audio_device.h
rename to src/modules/audio_device/include/audio_device.h
index 30b776d020..ef95ecddd1 100644
--- a/src/modules/audio_device/main/interface/audio_device.h
+++ b/src/modules/audio_device/include/audio_device.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 
-#include "modules/audio_device/main/interface/audio_device_defines.h"
+#include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/interface/module.h"
 
 namespace webrtc {
diff --git a/src/modules/audio_device/main/interface/audio_device_defines.h b/src/modules/audio_device/include/audio_device_defines.h
similarity index 100%
rename from src/modules/audio_device/main/interface/audio_device_defines.h
rename to src/modules/audio_device/include/audio_device_defines.h
diff --git a/src/modules/audio_device/main/source/ios/audio_device_ios.cc b/src/modules/audio_device/ios/audio_device_ios.cc
similarity index 100%
rename from src/modules/audio_device/main/source/ios/audio_device_ios.cc
rename to src/modules/audio_device/ios/audio_device_ios.cc
diff --git a/src/modules/audio_device/main/source/ios/audio_device_ios.h b/src/modules/audio_device/ios/audio_device_ios.h
similarity index 100%
rename from src/modules/audio_device/main/source/ios/audio_device_ios.h
rename to src/modules/audio_device/ios/audio_device_ios.h
diff --git a/src/modules/audio_device/main/source/ios/audio_device_utility_ios.cc b/src/modules/audio_device/ios/audio_device_utility_ios.cc
similarity index 100%
rename from src/modules/audio_device/main/source/ios/audio_device_utility_ios.cc
rename to src/modules/audio_device/ios/audio_device_utility_ios.cc
diff --git a/src/modules/audio_device/main/source/ios/audio_device_utility_ios.h b/src/modules/audio_device/ios/audio_device_utility_ios.h
similarity index 100%
rename from src/modules/audio_device/main/source/ios/audio_device_utility_ios.h
rename to src/modules/audio_device/ios/audio_device_utility_ios.h
diff --git a/src/modules/audio_device/main/source/linux/alsasymboltable_linux.cc b/src/modules/audio_device/linux/alsasymboltable_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/alsasymboltable_linux.cc
rename to src/modules/audio_device/linux/alsasymboltable_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/alsasymboltable_linux.h b/src/modules/audio_device/linux/alsasymboltable_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/alsasymboltable_linux.h
rename to src/modules/audio_device/linux/alsasymboltable_linux.h
diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc b/src/modules/audio_device/linux/audio_device_alsa_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc
rename to src/modules/audio_device/linux/audio_device_alsa_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h b/src/modules/audio_device/linux/audio_device_alsa_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h
rename to src/modules/audio_device/linux/audio_device_alsa_linux.h
diff --git a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc b/src/modules/audio_device/linux/audio_device_pulse_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc
rename to src/modules/audio_device/linux/audio_device_pulse_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.h b/src/modules/audio_device/linux/audio_device_pulse_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_pulse_linux.h
rename to src/modules/audio_device/linux/audio_device_pulse_linux.h
diff --git a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc b/src/modules/audio_device/linux/audio_device_utility_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc
rename to src/modules/audio_device/linux/audio_device_utility_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.h b/src/modules/audio_device/linux/audio_device_utility_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_device_utility_linux.h
rename to src/modules/audio_device/linux/audio_device_utility_linux.h
diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc b/src/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc
rename to src/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h b/src/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h
rename to src/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc b/src/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc
rename to src/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h b/src/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h
rename to src/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
diff --git a/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc b/src/modules/audio_device/linux/latebindingsymboltable_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
rename to src/modules/audio_device/linux/latebindingsymboltable_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.h b/src/modules/audio_device/linux/latebindingsymboltable_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.h
rename to src/modules/audio_device/linux/latebindingsymboltable_linux.h
diff --git a/src/modules/audio_device/main/source/linux/pulseaudiosymboltable_linux.cc b/src/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
similarity index 100%
rename from src/modules/audio_device/main/source/linux/pulseaudiosymboltable_linux.cc
rename to src/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
diff --git a/src/modules/audio_device/main/source/linux/pulseaudiosymboltable_linux.h b/src/modules/audio_device/linux/pulseaudiosymboltable_linux.h
similarity index 100%
rename from src/modules/audio_device/main/source/linux/pulseaudiosymboltable_linux.h
rename to src/modules/audio_device/linux/pulseaudiosymboltable_linux.h
diff --git a/src/modules/audio_device/main/source/mac/audio_device_mac.cc b/src/modules/audio_device/mac/audio_device_mac.cc
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_device_mac.cc
rename to src/modules/audio_device/mac/audio_device_mac.cc
diff --git a/src/modules/audio_device/main/source/mac/audio_device_mac.h b/src/modules/audio_device/mac/audio_device_mac.h
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_device_mac.h
rename to src/modules/audio_device/mac/audio_device_mac.h
diff --git a/src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc b/src/modules/audio_device/mac/audio_device_utility_mac.cc
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc
rename to src/modules/audio_device/mac/audio_device_utility_mac.cc
diff --git a/src/modules/audio_device/main/source/mac/audio_device_utility_mac.h b/src/modules/audio_device/mac/audio_device_utility_mac.h
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_device_utility_mac.h
rename to src/modules/audio_device/mac/audio_device_utility_mac.h
diff --git a/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc b/src/modules/audio_device/mac/audio_mixer_manager_mac.cc
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc
rename to src/modules/audio_device/mac/audio_mixer_manager_mac.cc
diff --git a/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.h b/src/modules/audio_device/mac/audio_mixer_manager_mac.h
similarity index 100%
rename from src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.h
rename to src/modules/audio_device/mac/audio_mixer_manager_mac.h
diff --git a/src/modules/audio_device/main/source/mac/portaudio/pa_memorybarrier.h b/src/modules/audio_device/mac/portaudio/pa_memorybarrier.h
similarity index 100%
rename from src/modules/audio_device/main/source/mac/portaudio/pa_memorybarrier.h
rename to src/modules/audio_device/mac/portaudio/pa_memorybarrier.h
diff --git a/src/modules/audio_device/main/source/mac/portaudio/pa_ringbuffer.c b/src/modules/audio_device/mac/portaudio/pa_ringbuffer.c
similarity index 100%
rename from src/modules/audio_device/main/source/mac/portaudio/pa_ringbuffer.c
rename to src/modules/audio_device/mac/portaudio/pa_ringbuffer.c
diff --git a/src/modules/audio_device/main/source/mac/portaudio/pa_ringbuffer.h b/src/modules/audio_device/mac/portaudio/pa_ringbuffer.h
similarity index 100%
rename from src/modules/audio_device/main/source/mac/portaudio/pa_ringbuffer.h
rename to src/modules/audio_device/mac/portaudio/pa_ringbuffer.h
diff --git a/src/modules/audio_device/main/test/README.txt b/src/modules/audio_device/test/README.txt
similarity index 100%
rename from src/modules/audio_device/main/test/README.txt
rename to src/modules/audio_device/test/README.txt
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/.classpath b/src/modules/audio_device/test/android/audio_device_android_test/.classpath
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/.classpath
rename to src/modules/audio_device/test/android/audio_device_android_test/.classpath
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/.project b/src/modules/audio_device/test/android/audio_device_android_test/.project
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/.project
rename to src/modules/audio_device/test/android/audio_device_android_test/.project
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/AndroidManifest.xml b/src/modules/audio_device/test/android/audio_device_android_test/AndroidManifest.xml
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/AndroidManifest.xml
rename to src/modules/audio_device/test/android/audio_device_android_test/AndroidManifest.xml
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/default.properties b/src/modules/audio_device/test/android/audio_device_android_test/default.properties
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/default.properties
rename to src/modules/audio_device/test/android/audio_device_android_test/default.properties
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java b/src/modules/audio_device/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
rename to src/modules/audio_device/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/jni/audio_device_android_test.cc b/src/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/jni/audio_device_android_test.cc
rename to src/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h b/src/modules/audio_device/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
rename to src/modules/audio_device/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/res/drawable/icon.png b/src/modules/audio_device/test/android/audio_device_android_test/res/drawable/icon.png
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/res/drawable/icon.png
rename to src/modules/audio_device/test/android/audio_device_android_test/res/drawable/icon.png
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/res/layout/main.xml b/src/modules/audio_device/test/android/audio_device_android_test/res/layout/main.xml
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/res/layout/main.xml
rename to src/modules/audio_device/test/android/audio_device_android_test/res/layout/main.xml
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/res/values/strings.xml b/src/modules/audio_device/test/android/audio_device_android_test/res/values/strings.xml
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/res/values/strings.xml
rename to src/modules/audio_device/test/android/audio_device_android_test/res/values/strings.xml
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java b/src/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
rename to src/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
diff --git a/src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java b/src/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
similarity index 100%
rename from src/modules/audio_device/main/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
rename to src/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
diff --git a/src/modules/audio_device/main/test/audio_device_test_api.cc b/src/modules/audio_device/test/audio_device_test_api.cc
similarity index 99%
rename from src/modules/audio_device/main/test/audio_device_test_api.cc
rename to src/modules/audio_device/test/audio_device_test_api.cc
index bd349fb7c4..b232878e27 100644
--- a/src/modules/audio_device/main/test/audio_device_test_api.cc
+++ b/src/modules/audio_device/test/audio_device_test_api.cc
@@ -17,9 +17,9 @@
 #include "gtest/gtest.h"
 #include "testsupport/fileutils.h"
 
-#include "../source/audio_device_config.h"
-#include "../source/audio_device_impl.h"
-#include "../source/audio_device_utility.h"
+#include "modules/audio_device/audio_device_config.h"
+#include "modules/audio_device/audio_device_impl.h"
+#include "modules/audio_device/audio_device_utility.h"
 #include "system_wrappers/interface/sleep.h"
 
 // Helper functions
diff --git a/src/modules/audio_device/main/test/audio_device_test_defines.h b/src/modules/audio_device/test/audio_device_test_defines.h
similarity index 100%
rename from src/modules/audio_device/main/test/audio_device_test_defines.h
rename to src/modules/audio_device/test/audio_device_test_defines.h
diff --git a/src/modules/audio_device/main/test/audio_device_test_func.cc b/src/modules/audio_device/test/audio_device_test_func.cc
similarity index 100%
rename from src/modules/audio_device/main/test/audio_device_test_func.cc
rename to src/modules/audio_device/test/audio_device_test_func.cc
diff --git a/src/modules/audio_device/main/test/func_test_manager.cc b/src/modules/audio_device/test/func_test_manager.cc
similarity index 99%
rename from src/modules/audio_device/main/test/func_test_manager.cc
rename to src/modules/audio_device/test/func_test_manager.cc
index 9b22ede47c..9ecec7ce6c 100644
--- a/src/modules/audio_device/main/test/func_test_manager.cc
+++ b/src/modules/audio_device/test/func_test_manager.cc
@@ -18,8 +18,8 @@
 #include "system_wrappers/interface/sleep.h"
 #include "testsupport/fileutils.h"
 
-#include "../source/audio_device_config.h"
-#include "../source/audio_device_impl.h"
+#include "modules/audio_device/audio_device_config.h"
+#include "modules/audio_device/audio_device_impl.h"
 
 #ifndef __GNUC__
 // Disable warning message ('sprintf': name was marked as #pragma deprecated)
diff --git a/src/modules/audio_device/main/test/func_test_manager.h b/src/modules/audio_device/test/func_test_manager.h
similarity index 99%
rename from src/modules/audio_device/main/test/func_test_manager.h
rename to src/modules/audio_device/test/func_test_manager.h
index 2fc00087fb..94de802c71 100644
--- a/src/modules/audio_device/main/test/func_test_manager.h
+++ b/src/modules/audio_device/test/func_test_manager.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 
-#include "../source/audio_device_utility.h"
+#include "modules/audio_device/audio_device_utility.h"
 
 #include <string>
 
diff --git a/src/modules/audio_device/main/source/win/audio_device_core_win.cc b/src/modules/audio_device/win/audio_device_core_win.cc
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_core_win.cc
rename to src/modules/audio_device/win/audio_device_core_win.cc
diff --git a/src/modules/audio_device/main/source/win/audio_device_core_win.h b/src/modules/audio_device/win/audio_device_core_win.h
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_core_win.h
rename to src/modules/audio_device/win/audio_device_core_win.h
diff --git a/src/modules/audio_device/main/source/win/audio_device_utility_win.cc b/src/modules/audio_device/win/audio_device_utility_win.cc
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_utility_win.cc
rename to src/modules/audio_device/win/audio_device_utility_win.cc
diff --git a/src/modules/audio_device/main/source/win/audio_device_utility_win.h b/src/modules/audio_device/win/audio_device_utility_win.h
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_utility_win.h
rename to src/modules/audio_device/win/audio_device_utility_win.h
diff --git a/src/modules/audio_device/main/source/win/audio_device_wave_win.cc b/src/modules/audio_device/win/audio_device_wave_win.cc
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_wave_win.cc
rename to src/modules/audio_device/win/audio_device_wave_win.cc
diff --git a/src/modules/audio_device/main/source/win/audio_device_wave_win.h b/src/modules/audio_device/win/audio_device_wave_win.h
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_device_wave_win.h
rename to src/modules/audio_device/win/audio_device_wave_win.h
diff --git a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc b/src/modules/audio_device/win/audio_mixer_manager_win.cc
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc
rename to src/modules/audio_device/win/audio_mixer_manager_win.cc
diff --git a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.h b/src/modules/audio_device/win/audio_mixer_manager_win.h
similarity index 100%
rename from src/modules/audio_device/main/source/win/audio_mixer_manager_win.h
rename to src/modules/audio_device/win/audio_mixer_manager_win.h
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index 6d58fc199c..089f53868c 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -19,7 +19,7 @@
     'audio_coding/main/source/audio_coding_module.gypi',
     'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
-    'audio_device/main/source/audio_device.gypi',
+    'audio_device/audio_device.gypi',
     'audio_processing/audio_processing.gypi',
     'bitrate_controller/bitrate_controller.gypi',
     'media_file/source/media_file.gypi',
diff --git a/src/voice_engine/test/auto_test/standard/hardware_test.cc b/src/voice_engine/test/auto_test/standard/hardware_test.cc
index f9994dac83..7310e52d2e 100644
--- a/src/voice_engine/test/auto_test/standard/hardware_test.cc
+++ b/src/voice_engine/test/auto_test/standard/hardware_test.cc
@@ -9,7 +9,7 @@
  */
 
 #include "after_streaming_fixture.h"
-#include "audio_device.h"
+#include "modules/audio_device/include/audio_device.h"
 #include "voe_test_defines.h"
 
 class HardwareTest : public AfterStreamingFixture {
diff --git a/src/voice_engine/test/auto_test/voe_extended_test.h b/src/voice_engine/test/auto_test/voe_extended_test.h
index 3552cf35e4..c685d885dc 100644
--- a/src/voice_engine/test/auto_test/voe_extended_test.h
+++ b/src/voice_engine/test/auto_test/voe_extended_test.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
 
 #include "voe_standard_test.h"
-#include "audio_device.h"
+#include "modules/audio_device/include/audio_device.h"
 
 namespace voetest {
 
diff --git a/src/voice_engine/voe_base_impl.cc b/src/voice_engine/voe_base_impl.cc
index 7039c4ee33..b63564639e 100644
--- a/src/voice_engine/voe_base_impl.cc
+++ b/src/voice_engine/voe_base_impl.cc
@@ -11,11 +11,11 @@
 #include "voe_base_impl.h"
 
 #include "audio_coding_module.h"
-#include "audio_device_impl.h"
 #include "audio_processing.h"
 #include "channel.h"
 #include "critical_section_wrapper.h"
 #include "file_wrapper.h"
+#include "modules/audio_device/audio_device_impl.h"
 #include "output_mixer.h"
 #include "signal_processing_library.h"
 #include "trace.h"