diff --git a/src/modules/media_file/source/media_file_unittest.cc b/src/modules/media_file/source/media_file_unittest.cc
index 07b5addb86..b9d003caa1 100644
--- a/src/modules/media_file/source/media_file_unittest.cc
+++ b/src/modules/media_file/source/media_file_unittest.cc
@@ -11,7 +11,7 @@
 #include "gtest/gtest.h"
 #include "modules/media_file/interface/media_file.h"
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/source/voice_engine_defines.h" // defines SLEEP
+#include "voice_engine/voice_engine_defines.h" // defines SLEEP
 
 class MediaFileTest : public testing::Test {
  protected:
diff --git a/src/video_engine/Android.mk b/src/video_engine/Android.mk
index 12d7c313ce..b0a0d63ff2 100644
--- a/src/video_engine/Android.mk
+++ b/src/video_engine/Android.mk
@@ -74,7 +74,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../modules/video_processing/main/interface \
     $(LOCAL_PATH)/../modules/video_render/main/interface \
     $(LOCAL_PATH)/../system_wrappers/interface \
-    $(LOCAL_PATH)/../voice_engine/main/interface
+    $(LOCAL_PATH)/../voice_engine/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/video_engine/main/test/android_test/jni/Android.mk b/src/video_engine/main/test/android_test/jni/Android.mk
index 9dac811099..b134ddad74 100644
--- a/src/video_engine/main/test/android_test/jni/Android.mk
+++ b/src/video_engine/main/test/android_test/jni/Android.mk
@@ -293,7 +293,7 @@ LOCAL_C_INCLUDES := \
     external/gtest/include \
     $(LOCAL_PATH)/../../../../.. \
     $(LOCAL_PATH)/../../../../include \
-    $(LOCAL_PATH)/../../../../../voice_engine/main/interface
+    $(LOCAL_PATH)/../../../../../voice_engine/include
 
 LOCAL_LDLIBS := \
     -llog \
diff --git a/src/video_engine/test/auto_test/android/jni/Android.mk b/src/video_engine/test/auto_test/android/jni/Android.mk
index ac439752bb..82a511f951 100644
--- a/src/video_engine/test/auto_test/android/jni/Android.mk
+++ b/src/video_engine/test/auto_test/android/jni/Android.mk
@@ -56,7 +56,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../../modules/video_capture/main/source \
     $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
     $(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
-    $(LOCAL_PATH)/../../../../../voice_engine/main/interface \
+    $(LOCAL_PATH)/../../../../../voice_engine/include \
     $(LOCAL_PATH)/../../../../../system_wrappers/interface 
 
 LOCAL_PRELINK_MODULE := false
diff --git a/src/video_engine/test/auto_test/source/Android.mk b/src/video_engine/test/auto_test/source/Android.mk
index 9e19418de9..ffdc613591 100644
--- a/src/video_engine/test/auto_test/source/Android.mk
+++ b/src/video_engine/test/auto_test/source/Android.mk
@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../modules/interface \
     $(LOCAL_PATH)/../../../../modules/video_capture/main/interface \
     $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../../voice_engine/main/interface
+    $(LOCAL_PATH)/../../../../voice_engine/include
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_capture.cc b/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
index 4d840bf918..174d1dbe4c 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_capture.cc
@@ -23,7 +23,7 @@
 #include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
 #include "video_engine/test/libvietest/include/tb_interfaces.h"
 #include "video_engine/test/libvietest/include/tb_video_channel.h"
-#include "voice_engine/main/interface/voe_base.h"
+#include "voice_engine/include/voe_base.h"
 
 DEFINE_bool(capture_test_ensure_resolution_alignment_in_capture_device, true,
             "If true, we will give resolutions slightly below a reasonable "
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_codec.cc b/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
index 42b1f16872..3029444370 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_codec.cc
@@ -22,7 +22,7 @@
 #include "video_engine/include/vie_network.h"
 #include "video_engine/include/vie_render.h"
 #include "video_engine/include/vie_rtp_rtcp.h"
-#include "voice_engine/main/interface/voe_base.h"
+#include "voice_engine/include/voe_base.h"
 
 class TestCodecObserver
     : public webrtc::ViEEncoderObserver,
diff --git a/src/video_engine/test/auto_test/source/vie_window_creator.cc b/src/video_engine/test/auto_test/source/vie_window_creator.cc
index 0ccd121a03..22052666bd 100644
--- a/src/video_engine/test/auto_test/source/vie_window_creator.cc
+++ b/src/video_engine/test/auto_test/source/vie_window_creator.cc
@@ -14,7 +14,7 @@
 #include "video_engine/test/auto_test/interface/vie_autotest_main.h"
 #include "video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
 #include "video_engine/test/auto_test/interface/vie_window_manager_factory.h"
-#include "voice_engine/main/interface/voe_codec.h"
+#include "voice_engine/include/voe_codec.h"
 
 #if defined(WIN32)
 #include <tchar.h>
diff --git a/src/video_engine/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc
index e29fadc4e2..abced05100 100644
--- a/src/video_engine/vie_channel_manager.cc
+++ b/src/video_engine/vie_channel_manager.cc
@@ -20,7 +20,7 @@
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_encoder.h"
 #include "video_engine/vie_remb.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 
diff --git a/src/video_engine/vie_file_player.cc b/src/video_engine/vie_file_player.cc
index eb96f0eb52..1f01cad00c 100644
--- a/src/video_engine/vie_file_player.cc
+++ b/src/video_engine/vie_file_player.cc
@@ -18,9 +18,9 @@
 #include "system_wrappers/interface/trace.h"
 #include "video_engine/include/vie_file.h"
 #include "video_engine/vie_defines.h"
-#include "voice_engine/main/interface/voe_base.h"
-#include "voice_engine/main/interface/voe_file.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_base.h"
+#include "voice_engine/include/voe_file.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 
diff --git a/src/video_engine/vie_file_recorder.h b/src/video_engine/vie_file_recorder.h
index ba25ce3771..cc964faf2e 100644
--- a/src/video_engine/vie_file_recorder.h
+++ b/src/video_engine/vie_file_recorder.h
@@ -14,7 +14,7 @@
 #include "modules/utility/interface/file_recorder.h"
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_file.h"
-#include "voice_engine/main/interface/voe_file.h"
+#include "voice_engine/include/voe_file.h"
 
 namespace webrtc {
 
diff --git a/src/video_engine/vie_sync_module.cc b/src/video_engine/vie_sync_module.cc
index 84752a9bd0..325b69b8a5 100644
--- a/src/video_engine/vie_sync_module.cc
+++ b/src/video_engine/vie_sync_module.cc
@@ -15,7 +15,7 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/trace.h"
 #include "video_engine/stream_synchronization.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 
diff --git a/src/voice_engine/main/source/Android.mk b/src/voice_engine/Android.mk
similarity index 100%
rename from src/voice_engine/main/source/Android.mk
rename to src/voice_engine/Android.mk
diff --git a/src/voice_engine/main/source/channel.cc b/src/voice_engine/channel.cc
similarity index 100%
rename from src/voice_engine/main/source/channel.cc
rename to src/voice_engine/channel.cc
diff --git a/src/voice_engine/main/source/channel.h b/src/voice_engine/channel.h
similarity index 100%
rename from src/voice_engine/main/source/channel.h
rename to src/voice_engine/channel.h
diff --git a/src/voice_engine/main/source/channel_manager.cc b/src/voice_engine/channel_manager.cc
similarity index 100%
rename from src/voice_engine/main/source/channel_manager.cc
rename to src/voice_engine/channel_manager.cc
diff --git a/src/voice_engine/main/source/channel_manager.h b/src/voice_engine/channel_manager.h
similarity index 100%
rename from src/voice_engine/main/source/channel_manager.h
rename to src/voice_engine/channel_manager.h
diff --git a/src/voice_engine/main/source/channel_manager_base.cc b/src/voice_engine/channel_manager_base.cc
similarity index 100%
rename from src/voice_engine/main/source/channel_manager_base.cc
rename to src/voice_engine/channel_manager_base.cc
diff --git a/src/voice_engine/main/source/channel_manager_base.h b/src/voice_engine/channel_manager_base.h
similarity index 100%
rename from src/voice_engine/main/source/channel_manager_base.h
rename to src/voice_engine/channel_manager_base.h
diff --git a/src/voice_engine/main/source/channel_unittest.cc b/src/voice_engine/channel_unittest.cc
similarity index 100%
rename from src/voice_engine/main/source/channel_unittest.cc
rename to src/voice_engine/channel_unittest.cc
diff --git a/src/voice_engine/main/source/dtmf_inband.cc b/src/voice_engine/dtmf_inband.cc
similarity index 100%
rename from src/voice_engine/main/source/dtmf_inband.cc
rename to src/voice_engine/dtmf_inband.cc
diff --git a/src/voice_engine/main/source/dtmf_inband.h b/src/voice_engine/dtmf_inband.h
similarity index 100%
rename from src/voice_engine/main/source/dtmf_inband.h
rename to src/voice_engine/dtmf_inband.h
diff --git a/src/voice_engine/main/source/dtmf_inband_queue.cc b/src/voice_engine/dtmf_inband_queue.cc
similarity index 100%
rename from src/voice_engine/main/source/dtmf_inband_queue.cc
rename to src/voice_engine/dtmf_inband_queue.cc
diff --git a/src/voice_engine/main/source/dtmf_inband_queue.h b/src/voice_engine/dtmf_inband_queue.h
similarity index 100%
rename from src/voice_engine/main/source/dtmf_inband_queue.h
rename to src/voice_engine/dtmf_inband_queue.h
diff --git a/src/voice_engine/main/interface/mock/mock_voe_connection_observer.h b/src/voice_engine/include/mock/mock_voe_connection_observer.h
similarity index 100%
rename from src/voice_engine/main/interface/mock/mock_voe_connection_observer.h
rename to src/voice_engine/include/mock/mock_voe_connection_observer.h
diff --git a/src/voice_engine/main/interface/mock/mock_voe_observer.h b/src/voice_engine/include/mock/mock_voe_observer.h
similarity index 100%
rename from src/voice_engine/main/interface/mock/mock_voe_observer.h
rename to src/voice_engine/include/mock/mock_voe_observer.h
diff --git a/src/voice_engine/main/interface/voe_audio_processing.h b/src/voice_engine/include/voe_audio_processing.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_audio_processing.h
rename to src/voice_engine/include/voe_audio_processing.h
diff --git a/src/voice_engine/main/interface/voe_base.h b/src/voice_engine/include/voe_base.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_base.h
rename to src/voice_engine/include/voe_base.h
diff --git a/src/voice_engine/main/interface/voe_call_report.h b/src/voice_engine/include/voe_call_report.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_call_report.h
rename to src/voice_engine/include/voe_call_report.h
diff --git a/src/voice_engine/main/interface/voe_codec.h b/src/voice_engine/include/voe_codec.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_codec.h
rename to src/voice_engine/include/voe_codec.h
diff --git a/src/voice_engine/main/interface/voe_dtmf.h b/src/voice_engine/include/voe_dtmf.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_dtmf.h
rename to src/voice_engine/include/voe_dtmf.h
diff --git a/src/voice_engine/main/interface/voe_encryption.h b/src/voice_engine/include/voe_encryption.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_encryption.h
rename to src/voice_engine/include/voe_encryption.h
diff --git a/src/voice_engine/main/interface/voe_errors.h b/src/voice_engine/include/voe_errors.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_errors.h
rename to src/voice_engine/include/voe_errors.h
diff --git a/src/voice_engine/main/interface/voe_external_media.h b/src/voice_engine/include/voe_external_media.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_external_media.h
rename to src/voice_engine/include/voe_external_media.h
diff --git a/src/voice_engine/main/interface/voe_file.h b/src/voice_engine/include/voe_file.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_file.h
rename to src/voice_engine/include/voe_file.h
diff --git a/src/voice_engine/main/interface/voe_hardware.h b/src/voice_engine/include/voe_hardware.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_hardware.h
rename to src/voice_engine/include/voe_hardware.h
diff --git a/src/voice_engine/main/interface/voe_neteq_stats.h b/src/voice_engine/include/voe_neteq_stats.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_neteq_stats.h
rename to src/voice_engine/include/voe_neteq_stats.h
diff --git a/src/voice_engine/main/interface/voe_network.h b/src/voice_engine/include/voe_network.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_network.h
rename to src/voice_engine/include/voe_network.h
diff --git a/src/voice_engine/main/interface/voe_rtp_rtcp.h b/src/voice_engine/include/voe_rtp_rtcp.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_rtp_rtcp.h
rename to src/voice_engine/include/voe_rtp_rtcp.h
diff --git a/src/voice_engine/main/interface/voe_video_sync.h b/src/voice_engine/include/voe_video_sync.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_video_sync.h
rename to src/voice_engine/include/voe_video_sync.h
diff --git a/src/voice_engine/main/interface/voe_volume_control.h b/src/voice_engine/include/voe_volume_control.h
similarity index 100%
rename from src/voice_engine/main/interface/voe_volume_control.h
rename to src/voice_engine/include/voe_volume_control.h
diff --git a/src/voice_engine/main/source/level_indicator.cc b/src/voice_engine/level_indicator.cc
similarity index 100%
rename from src/voice_engine/main/source/level_indicator.cc
rename to src/voice_engine/level_indicator.cc
diff --git a/src/voice_engine/main/source/level_indicator.h b/src/voice_engine/level_indicator.h
similarity index 100%
rename from src/voice_engine/main/source/level_indicator.h
rename to src/voice_engine/level_indicator.h
diff --git a/src/voice_engine/main/source/monitor_module.cc b/src/voice_engine/monitor_module.cc
similarity index 100%
rename from src/voice_engine/main/source/monitor_module.cc
rename to src/voice_engine/monitor_module.cc
diff --git a/src/voice_engine/main/source/monitor_module.h b/src/voice_engine/monitor_module.h
similarity index 100%
rename from src/voice_engine/main/source/monitor_module.h
rename to src/voice_engine/monitor_module.h
diff --git a/src/voice_engine/main/source/output_mixer.cc b/src/voice_engine/output_mixer.cc
similarity index 100%
rename from src/voice_engine/main/source/output_mixer.cc
rename to src/voice_engine/output_mixer.cc
diff --git a/src/voice_engine/main/source/output_mixer.h b/src/voice_engine/output_mixer.h
similarity index 100%
rename from src/voice_engine/main/source/output_mixer.h
rename to src/voice_engine/output_mixer.h
diff --git a/src/voice_engine/main/source/output_mixer_internal.cc b/src/voice_engine/output_mixer_internal.cc
similarity index 100%
rename from src/voice_engine/main/source/output_mixer_internal.cc
rename to src/voice_engine/output_mixer_internal.cc
diff --git a/src/voice_engine/main/source/output_mixer_internal.h b/src/voice_engine/output_mixer_internal.h
similarity index 100%
rename from src/voice_engine/main/source/output_mixer_internal.h
rename to src/voice_engine/output_mixer_internal.h
diff --git a/src/voice_engine/main/source/output_mixer_unittest.cc b/src/voice_engine/output_mixer_unittest.cc
similarity index 100%
rename from src/voice_engine/main/source/output_mixer_unittest.cc
rename to src/voice_engine/output_mixer_unittest.cc
diff --git a/src/voice_engine/main/source/shared_data.cc b/src/voice_engine/shared_data.cc
similarity index 100%
rename from src/voice_engine/main/source/shared_data.cc
rename to src/voice_engine/shared_data.cc
diff --git a/src/voice_engine/main/source/shared_data.h b/src/voice_engine/shared_data.h
similarity index 100%
rename from src/voice_engine/main/source/shared_data.h
rename to src/voice_engine/shared_data.h
diff --git a/src/voice_engine/main/source/statistics.cc b/src/voice_engine/statistics.cc
similarity index 100%
rename from src/voice_engine/main/source/statistics.cc
rename to src/voice_engine/statistics.cc
diff --git a/src/voice_engine/main/source/statistics.h b/src/voice_engine/statistics.h
similarity index 100%
rename from src/voice_engine/main/source/statistics.h
rename to src/voice_engine/statistics.h
diff --git a/src/voice_engine/main/test/android/android_test/.classpath b/src/voice_engine/test/android/android_test/.classpath
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/.classpath
rename to src/voice_engine/test/android/android_test/.classpath
diff --git a/src/voice_engine/main/test/android/android_test/.project b/src/voice_engine/test/android/android_test/.project
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/.project
rename to src/voice_engine/test/android/android_test/.project
diff --git a/src/voice_engine/main/test/android/android_test/Android.mk b/src/voice_engine/test/android/android_test/Android.mk
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/Android.mk
rename to src/voice_engine/test/android/android_test/Android.mk
diff --git a/src/voice_engine/main/test/android/android_test/AndroidManifest.xml b/src/voice_engine/test/android/android_test/AndroidManifest.xml
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/AndroidManifest.xml
rename to src/voice_engine/test/android/android_test/AndroidManifest.xml
diff --git a/src/voice_engine/main/test/android/android_test/default.properties b/src/voice_engine/test/android/android_test/default.properties
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/default.properties
rename to src/voice_engine/test/android/android_test/default.properties
diff --git a/src/voice_engine/main/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java b/src/voice_engine/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
rename to src/voice_engine/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
diff --git a/src/voice_engine/main/test/android/android_test/jni/Android.mk b/src/voice_engine/test/android/android_test/jni/Android.mk
similarity index 98%
rename from src/voice_engine/main/test/android/android_test/jni/Android.mk
rename to src/voice_engine/test/android/android_test/jni/Android.mk
index 9f9f761ff8..d7e04b5605 100644
--- a/src/voice_engine/main/test/android/android_test/jni/Android.mk
+++ b/src/voice_engine/test/android/android_test/jni/Android.mk
@@ -37,7 +37,7 @@ include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/rtp_rtcp/source
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/udp_transport/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/utility/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/system_wrappers/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/Android.mk
 
 LOCAL_PATH := $(call my-dir)
 
@@ -116,7 +116,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 ###
 
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/main/test/cmd_test/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/test/cmd_test/Android.mk
 
 else
 
diff --git a/src/voice_engine/main/test/android/android_test/jni/Application.mk b/src/voice_engine/test/android/android_test/jni/Application.mk
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/jni/Application.mk
rename to src/voice_engine/test/android/android_test/jni/Application.mk
diff --git a/src/voice_engine/main/test/android/android_test/jni/android_test.cc b/src/voice_engine/test/android/android_test/jni/android_test.cc
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/jni/android_test.cc
rename to src/voice_engine/test/android/android_test/jni/android_test.cc
diff --git a/src/voice_engine/main/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h b/src/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
rename to src/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
diff --git a/src/voice_engine/main/test/android/android_test/res/drawable/icon.png b/src/voice_engine/test/android/android_test/res/drawable/icon.png
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/res/drawable/icon.png
rename to src/voice_engine/test/android/android_test/res/drawable/icon.png
diff --git a/src/voice_engine/main/test/android/android_test/res/layout/main.xml b/src/voice_engine/test/android/android_test/res/layout/main.xml
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/res/layout/main.xml
rename to src/voice_engine/test/android/android_test/res/layout/main.xml
diff --git a/src/voice_engine/main/test/android/android_test/res/values/strings.xml b/src/voice_engine/test/android/android_test/res/values/strings.xml
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/res/values/strings.xml
rename to src/voice_engine/test/android/android_test/res/values/strings.xml
diff --git a/src/voice_engine/main/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java b/src/voice_engine/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
similarity index 100%
rename from src/voice_engine/main/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
rename to src/voice_engine/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
diff --git a/src/voice_engine/main/test/auto_test/Android.mk b/src/voice_engine/test/auto_test/Android.mk
similarity index 100%
rename from src/voice_engine/main/test/auto_test/Android.mk
rename to src/voice_engine/test/auto_test/Android.mk
diff --git a/src/voice_engine/main/test/auto_test/automated_mode.cc b/src/voice_engine/test/auto_test/automated_mode.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/automated_mode.cc
rename to src/voice_engine/test/auto_test/automated_mode.cc
diff --git a/src/voice_engine/main/test/auto_test/automated_mode.h b/src/voice_engine/test/auto_test/automated_mode.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/automated_mode.h
rename to src/voice_engine/test/auto_test/automated_mode.h
diff --git a/src/voice_engine/main/test/auto_test/extended/agc_config_test.cc b/src/voice_engine/test/auto_test/extended/agc_config_test.cc
similarity index 98%
rename from src/voice_engine/main/test/auto_test/extended/agc_config_test.cc
rename to src/voice_engine/test/auto_test/extended/agc_config_test.cc
index b140b5f08e..ee7e0624b5 100644
--- a/src/voice_engine/main/test/auto_test/extended/agc_config_test.cc
+++ b/src/voice_engine/test/auto_test/extended/agc_config_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class AgcConfigTest : public AfterStreamingFixture {
  protected:
diff --git a/src/voice_engine/main/test/auto_test/extended/ec_metrics_test.cc b/src/voice_engine/test/auto_test/extended/ec_metrics_test.cc
similarity index 97%
rename from src/voice_engine/main/test/auto_test/extended/ec_metrics_test.cc
rename to src/voice_engine/test/auto_test/extended/ec_metrics_test.cc
index b8010d320c..2d60d0d142 100644
--- a/src/voice_engine/main/test/auto_test/extended/ec_metrics_test.cc
+++ b/src/voice_engine/test/auto_test/extended/ec_metrics_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class EcMetricsTest : public AfterStreamingFixture {
 };
diff --git a/src/voice_engine/main/test/auto_test/fakes/fake_external_transport.cc b/src/voice_engine/test/auto_test/fakes/fake_external_transport.cc
similarity index 93%
rename from src/voice_engine/main/test/auto_test/fakes/fake_external_transport.cc
rename to src/voice_engine/test/auto_test/fakes/fake_external_transport.cc
index d1575ca010..1fd4a259fb 100644
--- a/src/voice_engine/main/test/auto_test/fakes/fake_external_transport.cc
+++ b/src/voice_engine/test/auto_test/fakes/fake_external_transport.cc
@@ -11,9 +11,9 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/event_wrapper.h"
 #include "system_wrappers/interface/thread_wrapper.h"
-#include "voice_engine/main/interface/voe_network.h"
-#include "voice_engine/main/source/voice_engine_defines.h"
-#include "voice_engine/main/test/auto_test/fakes/fake_external_transport.h"
+#include "voice_engine/include/voe_network.h"
+#include "voice_engine/voice_engine_defines.h"
+#include "voice_engine/test/auto_test/fakes/fake_external_transport.h"
 
 FakeExternalTransport::FakeExternalTransport(webrtc::VoENetwork* ptr)
     : my_network_(ptr),
diff --git a/src/voice_engine/main/test/auto_test/fakes/fake_external_transport.h b/src/voice_engine/test/auto_test/fakes/fake_external_transport.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fakes/fake_external_transport.h
rename to src/voice_engine/test/auto_test/fakes/fake_external_transport.h
diff --git a/src/voice_engine/main/test/auto_test/fakes/fake_media_process.h b/src/voice_engine/test/auto_test/fakes/fake_media_process.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fakes/fake_media_process.h
rename to src/voice_engine/test/auto_test/fakes/fake_media_process.h
diff --git a/src/voice_engine/main/test/auto_test/fixtures/after_initialization_fixture.cc b/src/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/after_initialization_fixture.cc
rename to src/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc
diff --git a/src/voice_engine/main/test/auto_test/fixtures/after_initialization_fixture.h b/src/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/after_initialization_fixture.h
rename to src/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
diff --git a/src/voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.cc b/src/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.cc
rename to src/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
diff --git a/src/voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h b/src/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h
rename to src/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h
diff --git a/src/voice_engine/main/test/auto_test/fixtures/before_initialization_fixture.cc b/src/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/before_initialization_fixture.cc
rename to src/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
diff --git a/src/voice_engine/main/test/auto_test/fixtures/before_initialization_fixture.h b/src/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/fixtures/before_initialization_fixture.h
rename to src/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
diff --git a/src/voice_engine/main/test/auto_test/fuzz/rtp_fuzz_test.cc b/src/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
similarity index 94%
rename from src/voice_engine/main/test/auto_test/fuzz/rtp_fuzz_test.cc
rename to src/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
index c1cd7a1d3b..f18d5e1a38 100644
--- a/src/voice_engine/main/test/auto_test/fuzz/rtp_fuzz_test.cc
+++ b/src/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
@@ -11,7 +11,7 @@
 #include <ctime>
 
 #include "test/libtest/include/bit_flip_encryption.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class RtpFuzzTest : public AfterStreamingFixture {
  protected:
diff --git a/src/voice_engine/main/test/auto_test/resource_manager.cc b/src/voice_engine/test/auto_test/resource_manager.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/resource_manager.cc
rename to src/voice_engine/test/auto_test/resource_manager.cc
diff --git a/src/voice_engine/main/test/auto_test/resource_manager.h b/src/voice_engine/test/auto_test/resource_manager.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/resource_manager.h
rename to src/voice_engine/test/auto_test/resource_manager.h
diff --git a/src/voice_engine/main/test/auto_test/standard/audio_processing_test.cc b/src/voice_engine/test/auto_test/standard/audio_processing_test.cc
similarity index 98%
rename from src/voice_engine/main/test/auto_test/standard/audio_processing_test.cc
rename to src/voice_engine/test/auto_test/standard/audio_processing_test.cc
index c7c5596b34..a7a5a07d99 100644
--- a/src/voice_engine/main/test/auto_test/standard/audio_processing_test.cc
+++ b/src/voice_engine/test/auto_test/standard/audio_processing_test.cc
@@ -9,8 +9,8 @@
  */
 
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/main/test/auto_test/voe_standard_test.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/voe_standard_test.h"
 
 class RxCallback : public webrtc::VoERxVadCallback {
  public:
diff --git a/src/voice_engine/main/test/auto_test/standard/call_report_test.cc b/src/voice_engine/test/auto_test/standard/call_report_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/call_report_test.cc
rename to src/voice_engine/test/auto_test/standard/call_report_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/codec_before_streaming_test.cc b/src/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/codec_before_streaming_test.cc
rename to src/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/codec_test.cc b/src/voice_engine/test/auto_test/standard/codec_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/codec_test.cc
rename to src/voice_engine/test/auto_test/standard/codec_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/dtmf_test.cc b/src/voice_engine/test/auto_test/standard/dtmf_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/dtmf_test.cc
rename to src/voice_engine/test/auto_test/standard/dtmf_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/encryption_test.cc b/src/voice_engine/test/auto_test/standard/encryption_test.cc
similarity index 95%
rename from src/voice_engine/main/test/auto_test/standard/encryption_test.cc
rename to src/voice_engine/test/auto_test/standard/encryption_test.cc
index fba5f9a49e..acb1a0dee5 100644
--- a/src/voice_engine/main/test/auto_test/standard/encryption_test.cc
+++ b/src/voice_engine/test/auto_test/standard/encryption_test.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/interface/voe_encryption.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/include/voe_encryption.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class BasicBitInverseEncryption : public webrtc::Encryption {
   void encrypt(int channel_no, unsigned char* in_data,
diff --git a/src/voice_engine/main/test/auto_test/standard/external_media_test.cc b/src/voice_engine/test/auto_test/standard/external_media_test.cc
similarity index 93%
rename from src/voice_engine/main/test/auto_test/standard/external_media_test.cc
rename to src/voice_engine/test/auto_test/standard/external_media_test.cc
index 559fada64e..5c641ba162 100644
--- a/src/voice_engine/main/test/auto_test/standard/external_media_test.cc
+++ b/src/voice_engine/test/auto_test/standard/external_media_test.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/interface/voe_external_media.h"
-#include "voice_engine/main/test/auto_test/fakes/fake_media_process.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/include/voe_external_media.h"
+#include "voice_engine/test/auto_test/fakes/fake_media_process.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class ExternalMediaTest : public AfterStreamingFixture {
  protected:
diff --git a/src/voice_engine/main/test/auto_test/standard/file_before_streaming_test.cc b/src/voice_engine/test/auto_test/standard/file_before_streaming_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/file_before_streaming_test.cc
rename to src/voice_engine/test/auto_test/standard/file_before_streaming_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/file_test.cc b/src/voice_engine/test/auto_test/standard/file_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/file_test.cc
rename to src/voice_engine/test/auto_test/standard/file_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/hardware_before_initializing_test.cc b/src/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/hardware_before_initializing_test.cc
rename to src/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/hardware_before_streaming_test.cc b/src/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/hardware_before_streaming_test.cc
rename to src/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/hardware_test.cc b/src/voice_engine/test/auto_test/standard/hardware_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/hardware_test.cc
rename to src/voice_engine/test/auto_test/standard/hardware_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/manual_hold_test.cc b/src/voice_engine/test/auto_test/standard/manual_hold_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/manual_hold_test.cc
rename to src/voice_engine/test/auto_test/standard/manual_hold_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/mixing_test.cc b/src/voice_engine/test/auto_test/standard/mixing_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/mixing_test.cc
rename to src/voice_engine/test/auto_test/standard/mixing_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/neteq_stats_test.cc b/src/voice_engine/test/auto_test/standard/neteq_stats_test.cc
similarity index 96%
rename from src/voice_engine/main/test/auto_test/standard/neteq_stats_test.cc
rename to src/voice_engine/test/auto_test/standard/neteq_stats_test.cc
index cdde7186ed..0cb4158adb 100644
--- a/src/voice_engine/main/test/auto_test/standard/neteq_stats_test.cc
+++ b/src/voice_engine/test/auto_test/standard/neteq_stats_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class NetEQStatsTest : public AfterStreamingFixture {
 };
diff --git a/src/voice_engine/main/test/auto_test/standard/neteq_test.cc b/src/voice_engine/test/auto_test/standard/neteq_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/neteq_test.cc
rename to src/voice_engine/test/auto_test/standard/neteq_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/network_before_streaming_test.cc b/src/voice_engine/test/auto_test/standard/network_before_streaming_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/network_before_streaming_test.cc
rename to src/voice_engine/test/auto_test/standard/network_before_streaming_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/network_test.cc b/src/voice_engine/test/auto_test/standard/network_test.cc
similarity index 94%
rename from src/voice_engine/main/test/auto_test/standard/network_test.cc
rename to src/voice_engine/test/auto_test/standard/network_test.cc
index 2082c7751b..e4aebd1722 100644
--- a/src/voice_engine/main/test/auto_test/standard/network_test.cc
+++ b/src/voice_engine/test/auto_test/standard/network_test.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/test/auto_test/fakes/fake_external_transport.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/main/test/auto_test/voe_test_interface.h"
-#include "voice_engine/main/interface/mock/mock_voe_connection_observer.h"
-#include "voice_engine/main/interface/mock/mock_voe_observer.h"
+#include "voice_engine/test/auto_test/fakes/fake_external_transport.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/voe_test_interface.h"
+#include "voice_engine/include/mock/mock_voe_connection_observer.h"
+#include "voice_engine/include/mock/mock_voe_observer.h"
 
 static const int kDefaultRtpPort = 8000;
 static const int kDefaultRtcpPort = 8001;
diff --git a/src/voice_engine/main/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc b/src/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
rename to src/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/rtp_rtcp_test.cc b/src/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/rtp_rtcp_test.cc
rename to src/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc b/src/voice_engine/test/auto_test/standard/video_sync_test.cc
similarity index 98%
rename from src/voice_engine/main/test/auto_test/standard/video_sync_test.cc
rename to src/voice_engine/test/auto_test/standard/video_sync_test.cc
index 275e580900..65516a1014 100644
--- a/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc
+++ b/src/voice_engine/test/auto_test/standard/video_sync_test.cc
@@ -12,7 +12,7 @@
 #include <numeric>
 #include <vector>
 
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 #ifdef MAC_IPHONE
   const int kMinimumReasonableDelayEstimateMs = 30;
diff --git a/src/voice_engine/main/test/auto_test/standard/voe_base_misc_test.cc b/src/voice_engine/test/auto_test/standard/voe_base_misc_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/voe_base_misc_test.cc
rename to src/voice_engine/test/auto_test/standard/voe_base_misc_test.cc
diff --git a/src/voice_engine/main/test/auto_test/standard/volume_test.cc b/src/voice_engine/test/auto_test/standard/volume_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/standard/volume_test.cc
rename to src/voice_engine/test/auto_test/standard/volume_test.cc
diff --git a/src/voice_engine/main/test/auto_test/voe_cpu_test.cc b/src/voice_engine/test/auto_test/voe_cpu_test.cc
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_cpu_test.cc
rename to src/voice_engine/test/auto_test/voe_cpu_test.cc
diff --git a/src/voice_engine/main/test/auto_test/voe_cpu_test.h b/src/voice_engine/test/auto_test/voe_cpu_test.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_cpu_test.h
rename to src/voice_engine/test/auto_test/voe_cpu_test.h
diff --git a/src/voice_engine/main/test/auto_test/voe_extended_test.cc b/src/voice_engine/test/auto_test/voe_extended_test.cc
similarity index 99%
rename from src/voice_engine/main/test/auto_test/voe_extended_test.cc
rename to src/voice_engine/test/auto_test/voe_extended_test.cc
index e74fe2e41b..b90e63c0fc 100644
--- a/src/voice_engine/main/test/auto_test/voe_extended_test.cc
+++ b/src/voice_engine/test/auto_test/voe_extended_test.cc
@@ -17,8 +17,8 @@
 #include "system_wrappers/interface/ref_count.h"
 #include "system_wrappers/interface/thread_wrapper.h"
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/source/voice_engine_defines.h"
-#include "voice_engine/main/test/auto_test/voe_extended_test.h"
+#include "voice_engine/voice_engine_defines.h"
+#include "voice_engine/test/auto_test/voe_extended_test.h"
 
 #if defined(_WIN32)
 #include <conio.h>
diff --git a/src/voice_engine/main/test/auto_test/voe_extended_test.h b/src/voice_engine/test/auto_test/voe_extended_test.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_extended_test.h
rename to src/voice_engine/test/auto_test/voe_extended_test.h
diff --git a/src/voice_engine/main/test/auto_test/voe_standard_test.cc b/src/voice_engine/test/auto_test/voe_standard_test.cc
similarity index 96%
rename from src/voice_engine/main/test/auto_test/voe_standard_test.cc
rename to src/voice_engine/test/auto_test/voe_standard_test.cc
index 8f668bdc83..69eb490e6c 100644
--- a/src/voice_engine/main/test/auto_test/voe_standard_test.cc
+++ b/src/voice_engine/test/auto_test/voe_standard_test.cc
@@ -18,7 +18,7 @@
 #include <tchar.h>
 #endif
 
-#include "voice_engine/main/test/auto_test/voe_standard_test.h"
+#include "voice_engine/test/auto_test/voe_standard_test.h"
 
 #if defined (_ENABLE_VISUAL_LEAK_DETECTOR_) && defined(_DEBUG) && \
     defined(_WIN32) && !defined(_INSTRUMENTATION_TESTING_)
@@ -28,17 +28,17 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/event_wrapper.h"
 #include "system_wrappers/interface/thread_wrapper.h"
-#include "voice_engine/main/source/voice_engine_defines.h"
-#include "voice_engine/main/test/auto_test/automated_mode.h"
+#include "voice_engine/voice_engine_defines.h"
+#include "voice_engine/test/auto_test/automated_mode.h"
 
 #ifdef _TEST_NETEQ_STATS_
-#include "voice_engine/main/interface/voe_neteq_stats.h"
+#include "voice_engine/include/voe_neteq_stats.h"
 #endif
 
-#include "voice_engine/main/test/auto_test/voe_cpu_test.h"
-#include "voice_engine/main/test/auto_test/voe_extended_test.h"
-#include "voice_engine/main/test/auto_test/voe_stress_test.h"
-#include "voice_engine/main/test/auto_test/voe_unit_test.h"
+#include "voice_engine/test/auto_test/voe_cpu_test.h"
+#include "voice_engine/test/auto_test/voe_extended_test.h"
+#include "voice_engine/test/auto_test/voe_stress_test.h"
+#include "voice_engine/test/auto_test/voe_unit_test.h"
 
 using namespace webrtc;
 
diff --git a/src/voice_engine/main/test/auto_test/voe_standard_test.h b/src/voice_engine/test/auto_test/voe_standard_test.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_standard_test.h
rename to src/voice_engine/test/auto_test/voe_standard_test.h
diff --git a/src/voice_engine/main/test/auto_test/voe_stress_test.cc b/src/voice_engine/test/auto_test/voe_stress_test.cc
similarity index 99%
rename from src/voice_engine/main/test/auto_test/voe_stress_test.cc
rename to src/voice_engine/test/auto_test/voe_stress_test.cc
index 024a25ba65..5bae92e4dd 100644
--- a/src/voice_engine/main/test/auto_test/voe_stress_test.cc
+++ b/src/voice_engine/test/auto_test/voe_stress_test.cc
@@ -25,7 +25,7 @@
 #include "voe_stress_test.h"
 #include "voe_standard_test.h"
 
-#include "../../source/voice_engine_defines.h"  // defines build macros
+#include "voice_engine/voice_engine_defines.h"  // defines build macros
 #include "thread_wrapper.h"
 
 using namespace webrtc;
diff --git a/src/voice_engine/main/test/auto_test/voe_stress_test.h b/src/voice_engine/test/auto_test/voe_stress_test.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_stress_test.h
rename to src/voice_engine/test/auto_test/voe_stress_test.h
diff --git a/src/voice_engine/main/test/auto_test/voe_test_defines.h b/src/voice_engine/test/auto_test/voe_test_defines.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_test_defines.h
rename to src/voice_engine/test/auto_test/voe_test_defines.h
diff --git a/src/voice_engine/main/test/auto_test/voe_test_interface.h b/src/voice_engine/test/auto_test/voe_test_interface.h
similarity index 100%
rename from src/voice_engine/main/test/auto_test/voe_test_interface.h
rename to src/voice_engine/test/auto_test/voe_test_interface.h
diff --git a/src/voice_engine/main/test/auto_test/voe_unit_test.cc b/src/voice_engine/test/auto_test/voe_unit_test.cc
similarity index 99%
rename from src/voice_engine/main/test/auto_test/voe_unit_test.cc
rename to src/voice_engine/test/auto_test/voe_unit_test.cc
index a53255bc26..d76c44837e 100644
--- a/src/voice_engine/main/test/auto_test/voe_unit_test.cc
+++ b/src/voice_engine/test/auto_test/voe_unit_test.cc
@@ -20,8 +20,8 @@
 
 #include "system_wrappers/interface/thread_wrapper.h"
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/source/voice_engine_defines.h"
-#include "voice_engine/main/test/auto_test/fakes/fake_media_process.h"
+#include "voice_engine/voice_engine_defines.h"
+#include "voice_engine/test/auto_test/fakes/fake_media_process.h"
 
 using namespace webrtc;
 
diff --git a/src/voice_engine/main/test/auto_test/voe_unit_test.h b/src/voice_engine/test/auto_test/voe_unit_test.h
similarity index 96%
rename from src/voice_engine/main/test/auto_test/voe_unit_test.h
rename to src/voice_engine/test/auto_test/voe_unit_test.h
index 5e9537c66b..346713a177 100644
--- a/src/voice_engine/main/test/auto_test/voe_unit_test.h
+++ b/src/voice_engine/test/auto_test/voe_unit_test.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H
 #define WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H
 
-#include "voice_engine/main/test/auto_test/voe_standard_test.h"
+#include "voice_engine/test/auto_test/voe_standard_test.h"
 
 namespace voetest {
 
diff --git a/src/voice_engine/main/test/cmd_test/Android.mk b/src/voice_engine/test/cmd_test/Android.mk
similarity index 100%
rename from src/voice_engine/main/test/cmd_test/Android.mk
rename to src/voice_engine/test/cmd_test/Android.mk
diff --git a/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc b/src/voice_engine/test/cmd_test/voe_cmd_test.cc
similarity index 100%
rename from src/voice_engine/main/test/cmd_test/voe_cmd_test.cc
rename to src/voice_engine/test/cmd_test/voe_cmd_test.cc
diff --git a/src/voice_engine/main/test/voice_engine_tests.gypi b/src/voice_engine/test/voice_engine_tests.gypi
similarity index 99%
rename from src/voice_engine/main/test/voice_engine_tests.gypi
rename to src/voice_engine/test/voice_engine_tests.gypi
index 796530c43b..de8811b3b6 100644
--- a/src/voice_engine/main/test/voice_engine_tests.gypi
+++ b/src/voice_engine/test/voice_engine_tests.gypi
@@ -26,7 +26,7 @@
         '<(webrtc_root)/modules/interface',
         # TODO(phoglund): We only depend on voice_engine_defines.h here -
         # move that file to interface and then remove this dependency.
-        '<(webrtc_root)/voice_engine/main/source',
+        '<(webrtc_root)/voice_engine',
         '<(webrtc_root)/modules/audio_device/main/interface',
       ],
       'sources': [
diff --git a/src/voice_engine/main/test/win_test/Resource.h b/src/voice_engine/test/win_test/Resource.h
similarity index 100%
rename from src/voice_engine/main/test/win_test/Resource.h
rename to src/voice_engine/test/win_test/Resource.h
diff --git a/src/voice_engine/main/test/win_test/WinTest.aps b/src/voice_engine/test/win_test/WinTest.aps
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTest.aps
rename to src/voice_engine/test/win_test/WinTest.aps
diff --git a/src/voice_engine/main/test/win_test/WinTest.cc b/src/voice_engine/test/win_test/WinTest.cc
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTest.cc
rename to src/voice_engine/test/win_test/WinTest.cc
diff --git a/src/voice_engine/main/test/win_test/WinTest.h b/src/voice_engine/test/win_test/WinTest.h
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTest.h
rename to src/voice_engine/test/win_test/WinTest.h
diff --git a/src/voice_engine/main/test/win_test/WinTest.rc b/src/voice_engine/test/win_test/WinTest.rc
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTest.rc
rename to src/voice_engine/test/win_test/WinTest.rc
diff --git a/src/voice_engine/main/test/win_test/WinTestDlg.cc b/src/voice_engine/test/win_test/WinTestDlg.cc
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTestDlg.cc
rename to src/voice_engine/test/win_test/WinTestDlg.cc
diff --git a/src/voice_engine/main/test/win_test/WinTestDlg.h b/src/voice_engine/test/win_test/WinTestDlg.h
similarity index 100%
rename from src/voice_engine/main/test/win_test/WinTestDlg.h
rename to src/voice_engine/test/win_test/WinTestDlg.h
diff --git a/src/voice_engine/main/test/win_test/res/WinTest.ico b/src/voice_engine/test/win_test/res/WinTest.ico
similarity index 100%
rename from src/voice_engine/main/test/win_test/res/WinTest.ico
rename to src/voice_engine/test/win_test/res/WinTest.ico
diff --git a/src/voice_engine/main/test/win_test/res/WinTest.rc2 b/src/voice_engine/test/win_test/res/WinTest.rc2
similarity index 100%
rename from src/voice_engine/main/test/win_test/res/WinTest.rc2
rename to src/voice_engine/test/win_test/res/WinTest.rc2
diff --git a/src/voice_engine/main/test/win_test/stdafx.cc b/src/voice_engine/test/win_test/stdafx.cc
similarity index 100%
rename from src/voice_engine/main/test/win_test/stdafx.cc
rename to src/voice_engine/test/win_test/stdafx.cc
diff --git a/src/voice_engine/main/test/win_test/stdafx.h b/src/voice_engine/test/win_test/stdafx.h
similarity index 100%
rename from src/voice_engine/main/test/win_test/stdafx.h
rename to src/voice_engine/test/win_test/stdafx.h
diff --git a/src/voice_engine/main/source/transmit_mixer.cc b/src/voice_engine/transmit_mixer.cc
similarity index 100%
rename from src/voice_engine/main/source/transmit_mixer.cc
rename to src/voice_engine/transmit_mixer.cc
diff --git a/src/voice_engine/main/source/transmit_mixer.h b/src/voice_engine/transmit_mixer.h
similarity index 100%
rename from src/voice_engine/main/source/transmit_mixer.h
rename to src/voice_engine/transmit_mixer.h
diff --git a/src/voice_engine/main/source/utility.cc b/src/voice_engine/utility.cc
similarity index 100%
rename from src/voice_engine/main/source/utility.cc
rename to src/voice_engine/utility.cc
diff --git a/src/voice_engine/main/source/utility.h b/src/voice_engine/utility.h
similarity index 100%
rename from src/voice_engine/main/source/utility.h
rename to src/voice_engine/utility.h
diff --git a/src/voice_engine/main/source/voe_audio_processing_impl.cc b/src/voice_engine/voe_audio_processing_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_audio_processing_impl.cc
rename to src/voice_engine/voe_audio_processing_impl.cc
diff --git a/src/voice_engine/main/source/voe_audio_processing_impl.h b/src/voice_engine/voe_audio_processing_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_audio_processing_impl.h
rename to src/voice_engine/voe_audio_processing_impl.h
diff --git a/src/voice_engine/main/source/voe_base_impl.cc b/src/voice_engine/voe_base_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_base_impl.cc
rename to src/voice_engine/voe_base_impl.cc
diff --git a/src/voice_engine/main/source/voe_base_impl.h b/src/voice_engine/voe_base_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_base_impl.h
rename to src/voice_engine/voe_base_impl.h
diff --git a/src/voice_engine/main/source/voe_call_report_impl.cc b/src/voice_engine/voe_call_report_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_call_report_impl.cc
rename to src/voice_engine/voe_call_report_impl.cc
diff --git a/src/voice_engine/main/source/voe_call_report_impl.h b/src/voice_engine/voe_call_report_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_call_report_impl.h
rename to src/voice_engine/voe_call_report_impl.h
diff --git a/src/voice_engine/main/source/voe_codec_impl.cc b/src/voice_engine/voe_codec_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_codec_impl.cc
rename to src/voice_engine/voe_codec_impl.cc
diff --git a/src/voice_engine/main/source/voe_codec_impl.h b/src/voice_engine/voe_codec_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_codec_impl.h
rename to src/voice_engine/voe_codec_impl.h
diff --git a/src/voice_engine/main/source/voe_dtmf_impl.cc b/src/voice_engine/voe_dtmf_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_dtmf_impl.cc
rename to src/voice_engine/voe_dtmf_impl.cc
diff --git a/src/voice_engine/main/source/voe_dtmf_impl.h b/src/voice_engine/voe_dtmf_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_dtmf_impl.h
rename to src/voice_engine/voe_dtmf_impl.h
diff --git a/src/voice_engine/main/source/voe_encryption_impl.cc b/src/voice_engine/voe_encryption_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_encryption_impl.cc
rename to src/voice_engine/voe_encryption_impl.cc
diff --git a/src/voice_engine/main/source/voe_encryption_impl.h b/src/voice_engine/voe_encryption_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_encryption_impl.h
rename to src/voice_engine/voe_encryption_impl.h
diff --git a/src/voice_engine/main/source/voe_external_media_impl.cc b/src/voice_engine/voe_external_media_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_external_media_impl.cc
rename to src/voice_engine/voe_external_media_impl.cc
diff --git a/src/voice_engine/main/source/voe_external_media_impl.h b/src/voice_engine/voe_external_media_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_external_media_impl.h
rename to src/voice_engine/voe_external_media_impl.h
diff --git a/src/voice_engine/main/source/voe_file_impl.cc b/src/voice_engine/voe_file_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_file_impl.cc
rename to src/voice_engine/voe_file_impl.cc
diff --git a/src/voice_engine/main/source/voe_file_impl.h b/src/voice_engine/voe_file_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_file_impl.h
rename to src/voice_engine/voe_file_impl.h
diff --git a/src/voice_engine/main/source/voe_hardware_impl.cc b/src/voice_engine/voe_hardware_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_hardware_impl.cc
rename to src/voice_engine/voe_hardware_impl.cc
diff --git a/src/voice_engine/main/source/voe_hardware_impl.h b/src/voice_engine/voe_hardware_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_hardware_impl.h
rename to src/voice_engine/voe_hardware_impl.h
diff --git a/src/voice_engine/main/source/voe_neteq_stats_impl.cc b/src/voice_engine/voe_neteq_stats_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_neteq_stats_impl.cc
rename to src/voice_engine/voe_neteq_stats_impl.cc
diff --git a/src/voice_engine/main/source/voe_neteq_stats_impl.h b/src/voice_engine/voe_neteq_stats_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_neteq_stats_impl.h
rename to src/voice_engine/voe_neteq_stats_impl.h
diff --git a/src/voice_engine/main/source/voe_network_impl.cc b/src/voice_engine/voe_network_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_network_impl.cc
rename to src/voice_engine/voe_network_impl.cc
diff --git a/src/voice_engine/main/source/voe_network_impl.h b/src/voice_engine/voe_network_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_network_impl.h
rename to src/voice_engine/voe_network_impl.h
diff --git a/src/voice_engine/main/source/voe_rtp_rtcp_impl.cc b/src/voice_engine/voe_rtp_rtcp_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_rtp_rtcp_impl.cc
rename to src/voice_engine/voe_rtp_rtcp_impl.cc
diff --git a/src/voice_engine/main/source/voe_rtp_rtcp_impl.h b/src/voice_engine/voe_rtp_rtcp_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_rtp_rtcp_impl.h
rename to src/voice_engine/voe_rtp_rtcp_impl.h
diff --git a/src/voice_engine/main/source/voe_video_sync_impl.cc b/src/voice_engine/voe_video_sync_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_video_sync_impl.cc
rename to src/voice_engine/voe_video_sync_impl.cc
diff --git a/src/voice_engine/main/source/voe_video_sync_impl.h b/src/voice_engine/voe_video_sync_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_video_sync_impl.h
rename to src/voice_engine/voe_video_sync_impl.h
diff --git a/src/voice_engine/main/source/voe_volume_control_impl.cc b/src/voice_engine/voe_volume_control_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voe_volume_control_impl.cc
rename to src/voice_engine/voe_volume_control_impl.cc
diff --git a/src/voice_engine/main/source/voe_volume_control_impl.h b/src/voice_engine/voe_volume_control_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voe_volume_control_impl.h
rename to src/voice_engine/voe_volume_control_impl.h
diff --git a/src/voice_engine/voice_engine.gyp b/src/voice_engine/voice_engine.gyp
index 6fdc0d7749..ebf13ca673 100644
--- a/src/voice_engine/voice_engine.gyp
+++ b/src/voice_engine/voice_engine.gyp
@@ -9,14 +9,14 @@
 {
   'includes': [
     '../build/common.gypi',
-    'main/source/voice_engine_core.gypi',
+    'voice_engine_core.gypi',
   ],
 
   # Test targets, excluded when building with Chromium.
   'conditions': [
     ['include_tests==1', {
       'includes': [
-        'main/test/voice_engine_tests.gypi',
+        'test/voice_engine_tests.gypi',
       ],
     }],
   ],
diff --git a/src/voice_engine/main/source/voice_engine_core.gypi b/src/voice_engine/voice_engine_core.gypi
similarity index 82%
rename from src/voice_engine/main/source/voice_engine_core.gypi
rename to src/voice_engine/voice_engine_core.gypi
index 5bb8d46f27..10a8d05d46 100644
--- a/src/voice_engine/main/source/voice_engine_core.gypi
+++ b/src/voice_engine/voice_engine_core.gypi
@@ -25,35 +25,33 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
-        '../../..',
-        '../interface',
+        'include',
         '<(webrtc_root)/modules/audio_device/main/source',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../../..',
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../../../common_types.h',
-        '../../../engine_configurations.h',
-        '../../../typedefs.h',
-        '../interface/voe_audio_processing.h',
-        '../interface/voe_base.h',
-        '../interface/voe_call_report.h',
-        '../interface/voe_codec.h',
-        '../interface/voe_dtmf.h',
-        '../interface/voe_encryption.h',
-        '../interface/voe_errors.h',
-        '../interface/voe_external_media.h',
-        '../interface/voe_file.h',
-        '../interface/voe_hardware.h',
-        '../interface/voe_neteq_stats.h',
-        '../interface/voe_network.h',
-        '../interface/voe_rtp_rtcp.h',
-        '../interface/voe_video_sync.h',
-        '../interface/voe_volume_control.h',
+        '../common_types.h',
+        '../engine_configurations.h',
+        '../typedefs.h',
+        'include/voe_audio_processing.h',
+        'include/voe_base.h',
+        'include/voe_call_report.h',
+        'include/voe_codec.h',
+        'include/voe_dtmf.h',
+        'include/voe_encryption.h',
+        'include/voe_errors.h',
+        'include/voe_external_media.h',
+        'include/voe_file.h',
+        'include/voe_hardware.h',
+        'include/voe_neteq_stats.h',
+        'include/voe_network.h',
+        'include/voe_rtp_rtcp.h',
+        'include/voe_video_sync.h',
+        'include/voe_volume_control.h',
         'channel.cc',
         'channel.h',
         'channel_manager.cc',
@@ -138,7 +136,7 @@
             '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
           ],
           'include_dirs': [
-            '../interface',
+            'include',
           ],
           'sources': [
             'channel_unittest.cc',
@@ -149,9 +147,3 @@
     }], # include_tests
   ], # conditions
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/voice_engine/main/source/voice_engine_defines.h b/src/voice_engine/voice_engine_defines.h
similarity index 100%
rename from src/voice_engine/main/source/voice_engine_defines.h
rename to src/voice_engine/voice_engine_defines.h
diff --git a/src/voice_engine/main/source/voice_engine_impl.cc b/src/voice_engine/voice_engine_impl.cc
similarity index 100%
rename from src/voice_engine/main/source/voice_engine_impl.cc
rename to src/voice_engine/voice_engine_impl.cc
diff --git a/src/voice_engine/main/source/voice_engine_impl.h b/src/voice_engine/voice_engine_impl.h
similarity index 100%
rename from src/voice_engine/main/source/voice_engine_impl.h
rename to src/voice_engine/voice_engine_impl.h
diff --git a/tools/e2e_quality/audio/audio_e2e_harness.cc b/tools/e2e_quality/audio/audio_e2e_harness.cc
index 80a1341bc9..a4789f2551 100644
--- a/tools/e2e_quality/audio/audio_e2e_harness.cc
+++ b/tools/e2e_quality/audio/audio_e2e_harness.cc
@@ -15,10 +15,10 @@
 #include "gflags/gflags.h"
 #include "gtest/gtest.h"
 
-#include "src/voice_engine/main/interface/voe_audio_processing.h"
-#include "src/voice_engine/main/interface/voe_base.h"
-#include "src/voice_engine/main/interface/voe_codec.h"
-#include "src/voice_engine/main/interface/voe_hardware.h"
+#include "src/voice_engine/include/voe_audio_processing.h"
+#include "src/voice_engine/include/voe_base.h"
+#include "src/voice_engine/include/voe_codec.h"
+#include "src/voice_engine/include/voe_hardware.h"
 
 DEFINE_string(render, "render", "render device name");
 DEFINE_string(codec, "ISAC", "codec name");