diff --git a/src/video_engine/main/source/Android.mk b/src/video_engine/Android.mk
similarity index 58%
rename from src/video_engine/main/source/Android.mk
rename to src/video_engine/Android.mk
index 44743b73c..66b3c910f 100644
--- a/src/video_engine/main/source/Android.mk
+++ b/src/video_engine/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_vie_core
@@ -52,27 +52,27 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_video/interface \
-    $(LOCAL_PATH)/../../../common_video/jpeg/main/interface \
-    $(LOCAL_PATH)/../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../modules/interface \
-    $(LOCAL_PATH)/../../../modules/audio_coding/main/interface \
-    $(LOCAL_PATH)/../../../modules/media_file/interface \
-    $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \
-    $(LOCAL_PATH)/../../../modules/udp_transport/interface \
-    $(LOCAL_PATH)/../../../modules/utility/interface \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/source \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/source/Android \
-    $(LOCAL_PATH)/../../../modules/video_coding/codecs/interface \
-    $(LOCAL_PATH)/../../../modules/video_coding/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_mixer/main/interface \
-    $(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)/main/interface \
+    $(LOCAL_PATH)/.. \
+    $(LOCAL_PATH)/../common_video/interface \
+    $(LOCAL_PATH)/../common_video/jpeg/main/interface \
+    $(LOCAL_PATH)/../common_video/vplib/main/interface \
+    $(LOCAL_PATH)/../modules/interface \
+    $(LOCAL_PATH)/../modules/audio_coding/main/interface \
+    $(LOCAL_PATH)/../modules/media_file/interface \
+    $(LOCAL_PATH)/../modules/rtp_rtcp/interface \
+    $(LOCAL_PATH)/../modules/udp_transport/interface \
+    $(LOCAL_PATH)/../modules/utility/interface \
+    $(LOCAL_PATH)/../modules/video_capture/main/interface \
+    $(LOCAL_PATH)/../modules/video_capture/main/source \
+    $(LOCAL_PATH)/../modules/video_capture/main/source/Android \
+    $(LOCAL_PATH)/../modules/video_coding/codecs/interface \
+    $(LOCAL_PATH)/../modules/video_coding/main/interface \
+    $(LOCAL_PATH)/../modules/video_mixer/main/interface \
+    $(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_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
index c054d4593..3f0f0c698 100644
--- a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
+++ b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
@@ -26,7 +26,7 @@
         'helpers/',
         'primitives',
         '../../interface',
-        '../../source',
+        '../../../',
         '../../../../modules/video_coding/codecs/interface/',
         '../../../../common_video/interface/',
       ],
@@ -44,13 +44,13 @@
         'interface/vie_autotest_main.h',
         'interface/vie_autotest_window_manager_interface.h',
         'interface/vie_autotest_windows.h',
-        
+
         # Helper classes
         'helpers/vie_fake_camera.cc',
         'helpers/vie_file_capture_device.cc',
         'helpers/vie_to_file_renderer.cc',
         'helpers/vie_window_creator.cc',
-        
+
         # New, fully automated tests
         'automated/vie_api_integration_test.cc',
         'automated/vie_comparison_test.cc',
diff --git a/src/video_engine/video_engine.gyp b/src/video_engine/video_engine.gyp
index 88473ebd3..56d68465f 100644
--- a/src/video_engine/video_engine.gyp
+++ b/src/video_engine/video_engine.gyp
@@ -9,7 +9,7 @@
 {
   'includes': [
     '../build/common.gypi',
-    'main/source/video_engine_core.gypi',
+    './video_engine_core.gypi',
   ],
 
   # Test targets, excluded when building with Chromium.
diff --git a/src/video_engine/main/source/video_engine_core.gypi b/src/video_engine/video_engine_core.gypi
similarity index 84%
rename from src/video_engine/main/source/video_engine_core.gypi
rename to src/video_engine/video_engine_core.gypi
index dc7253e95..f33c1d5de 100644
--- a/src/video_engine/main/source/video_engine_core.gypi
+++ b/src/video_engine/video_engine_core.gypi
@@ -35,29 +35,29 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
-        '../interface',
-        '../../../common_video/interface',
-        '../../../modules/video_capture/main/interface',
-        '../../../modules/video_render/main/interface',
+        'main/interface',
+        '../common_video/interface',
+        '../modules/video_capture/main/interface',
+        '../modules/video_render/main/interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'main/interface',
         ],
       },
       'sources': [
         # interface
-        '../interface/vie_base.h',
-        '../interface/vie_capture.h',
-        '../interface/vie_codec.h',
-        '../interface/vie_encryption.h',
-        '../interface/vie_errors.h',
-        '../interface/vie_external_codec.h',
-        '../interface/vie_file.h',
-        '../interface/vie_image_process.h',
-        '../interface/vie_network.h',
-        '../interface/vie_render.h',
-        '../interface/vie_rtp_rtcp.h',
+        'main/interface/vie_base.h',
+        'main/interface/vie_capture.h',
+        'main/interface/vie_codec.h',
+        'main/interface/vie_encryption.h',
+        'main/interface/vie_errors.h',
+        'main/interface/vie_external_codec.h',
+        'main/interface/vie_file.h',
+        'main/interface/vie_image_process.h',
+        'main/interface/vie_network.h',
+        'main/interface/vie_render.h',
+        'main/interface/vie_rtp_rtcp.h',
 
         # headers
         'vie_base_impl.h',
diff --git a/src/video_engine/main/source/vie_base_impl.cc b/src/video_engine/vie_base_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_base_impl.cc
rename to src/video_engine/vie_base_impl.cc
diff --git a/src/video_engine/main/source/vie_base_impl.h b/src/video_engine/vie_base_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_base_impl.h
rename to src/video_engine/vie_base_impl.h
diff --git a/src/video_engine/main/source/vie_capture_impl.cc b/src/video_engine/vie_capture_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_capture_impl.cc
rename to src/video_engine/vie_capture_impl.cc
diff --git a/src/video_engine/main/source/vie_capture_impl.h b/src/video_engine/vie_capture_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_capture_impl.h
rename to src/video_engine/vie_capture_impl.h
diff --git a/src/video_engine/main/source/vie_capturer.cc b/src/video_engine/vie_capturer.cc
similarity index 100%
rename from src/video_engine/main/source/vie_capturer.cc
rename to src/video_engine/vie_capturer.cc
diff --git a/src/video_engine/main/source/vie_capturer.h b/src/video_engine/vie_capturer.h
similarity index 100%
rename from src/video_engine/main/source/vie_capturer.h
rename to src/video_engine/vie_capturer.h
diff --git a/src/video_engine/main/source/vie_channel.cc b/src/video_engine/vie_channel.cc
similarity index 100%
rename from src/video_engine/main/source/vie_channel.cc
rename to src/video_engine/vie_channel.cc
diff --git a/src/video_engine/main/source/vie_channel.h b/src/video_engine/vie_channel.h
similarity index 100%
rename from src/video_engine/main/source/vie_channel.h
rename to src/video_engine/vie_channel.h
diff --git a/src/video_engine/main/source/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc
similarity index 100%
rename from src/video_engine/main/source/vie_channel_manager.cc
rename to src/video_engine/vie_channel_manager.cc
diff --git a/src/video_engine/main/source/vie_channel_manager.h b/src/video_engine/vie_channel_manager.h
similarity index 100%
rename from src/video_engine/main/source/vie_channel_manager.h
rename to src/video_engine/vie_channel_manager.h
diff --git a/src/video_engine/main/source/vie_codec_impl.cc b/src/video_engine/vie_codec_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_codec_impl.cc
rename to src/video_engine/vie_codec_impl.cc
diff --git a/src/video_engine/main/source/vie_codec_impl.h b/src/video_engine/vie_codec_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_codec_impl.h
rename to src/video_engine/vie_codec_impl.h
diff --git a/src/video_engine/main/source/vie_defines.h b/src/video_engine/vie_defines.h
similarity index 100%
rename from src/video_engine/main/source/vie_defines.h
rename to src/video_engine/vie_defines.h
diff --git a/src/video_engine/main/source/vie_encoder.cc b/src/video_engine/vie_encoder.cc
similarity index 100%
rename from src/video_engine/main/source/vie_encoder.cc
rename to src/video_engine/vie_encoder.cc
diff --git a/src/video_engine/main/source/vie_encoder.h b/src/video_engine/vie_encoder.h
similarity index 100%
rename from src/video_engine/main/source/vie_encoder.h
rename to src/video_engine/vie_encoder.h
diff --git a/src/video_engine/main/source/vie_encryption_impl.cc b/src/video_engine/vie_encryption_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_encryption_impl.cc
rename to src/video_engine/vie_encryption_impl.cc
diff --git a/src/video_engine/main/source/vie_encryption_impl.h b/src/video_engine/vie_encryption_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_encryption_impl.h
rename to src/video_engine/vie_encryption_impl.h
diff --git a/src/video_engine/main/source/vie_external_codec_impl.cc b/src/video_engine/vie_external_codec_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_external_codec_impl.cc
rename to src/video_engine/vie_external_codec_impl.cc
diff --git a/src/video_engine/main/source/vie_external_codec_impl.h b/src/video_engine/vie_external_codec_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_external_codec_impl.h
rename to src/video_engine/vie_external_codec_impl.h
diff --git a/src/video_engine/main/source/vie_file_image.cc b/src/video_engine/vie_file_image.cc
similarity index 100%
rename from src/video_engine/main/source/vie_file_image.cc
rename to src/video_engine/vie_file_image.cc
diff --git a/src/video_engine/main/source/vie_file_image.h b/src/video_engine/vie_file_image.h
similarity index 100%
rename from src/video_engine/main/source/vie_file_image.h
rename to src/video_engine/vie_file_image.h
diff --git a/src/video_engine/main/source/vie_file_impl.cc b/src/video_engine/vie_file_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_file_impl.cc
rename to src/video_engine/vie_file_impl.cc
diff --git a/src/video_engine/main/source/vie_file_impl.h b/src/video_engine/vie_file_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_file_impl.h
rename to src/video_engine/vie_file_impl.h
diff --git a/src/video_engine/main/source/vie_file_player.cc b/src/video_engine/vie_file_player.cc
similarity index 100%
rename from src/video_engine/main/source/vie_file_player.cc
rename to src/video_engine/vie_file_player.cc
diff --git a/src/video_engine/main/source/vie_file_player.h b/src/video_engine/vie_file_player.h
similarity index 100%
rename from src/video_engine/main/source/vie_file_player.h
rename to src/video_engine/vie_file_player.h
diff --git a/src/video_engine/main/source/vie_file_recorder.cc b/src/video_engine/vie_file_recorder.cc
similarity index 100%
rename from src/video_engine/main/source/vie_file_recorder.cc
rename to src/video_engine/vie_file_recorder.cc
diff --git a/src/video_engine/main/source/vie_file_recorder.h b/src/video_engine/vie_file_recorder.h
similarity index 100%
rename from src/video_engine/main/source/vie_file_recorder.h
rename to src/video_engine/vie_file_recorder.h
diff --git a/src/video_engine/main/source/vie_frame_provider_base.cc b/src/video_engine/vie_frame_provider_base.cc
similarity index 100%
rename from src/video_engine/main/source/vie_frame_provider_base.cc
rename to src/video_engine/vie_frame_provider_base.cc
diff --git a/src/video_engine/main/source/vie_frame_provider_base.h b/src/video_engine/vie_frame_provider_base.h
similarity index 100%
rename from src/video_engine/main/source/vie_frame_provider_base.h
rename to src/video_engine/vie_frame_provider_base.h
diff --git a/src/video_engine/main/source/vie_image_process_impl.cc b/src/video_engine/vie_image_process_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_image_process_impl.cc
rename to src/video_engine/vie_image_process_impl.cc
diff --git a/src/video_engine/main/source/vie_image_process_impl.h b/src/video_engine/vie_image_process_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_image_process_impl.h
rename to src/video_engine/vie_image_process_impl.h
diff --git a/src/video_engine/main/source/vie_impl.cc b/src/video_engine/vie_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_impl.cc
rename to src/video_engine/vie_impl.cc
diff --git a/src/video_engine/main/source/vie_impl.h b/src/video_engine/vie_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_impl.h
rename to src/video_engine/vie_impl.h
diff --git a/src/video_engine/main/source/vie_input_manager.cc b/src/video_engine/vie_input_manager.cc
similarity index 100%
rename from src/video_engine/main/source/vie_input_manager.cc
rename to src/video_engine/vie_input_manager.cc
diff --git a/src/video_engine/main/source/vie_input_manager.h b/src/video_engine/vie_input_manager.h
similarity index 100%
rename from src/video_engine/main/source/vie_input_manager.h
rename to src/video_engine/vie_input_manager.h
diff --git a/src/video_engine/main/source/vie_manager_base.cc b/src/video_engine/vie_manager_base.cc
similarity index 100%
rename from src/video_engine/main/source/vie_manager_base.cc
rename to src/video_engine/vie_manager_base.cc
diff --git a/src/video_engine/main/source/vie_manager_base.h b/src/video_engine/vie_manager_base.h
similarity index 100%
rename from src/video_engine/main/source/vie_manager_base.h
rename to src/video_engine/vie_manager_base.h
diff --git a/src/video_engine/main/source/vie_network_impl.cc b/src/video_engine/vie_network_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_network_impl.cc
rename to src/video_engine/vie_network_impl.cc
diff --git a/src/video_engine/main/source/vie_network_impl.h b/src/video_engine/vie_network_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_network_impl.h
rename to src/video_engine/vie_network_impl.h
diff --git a/src/video_engine/main/source/vie_performance_monitor.cc b/src/video_engine/vie_performance_monitor.cc
similarity index 100%
rename from src/video_engine/main/source/vie_performance_monitor.cc
rename to src/video_engine/vie_performance_monitor.cc
diff --git a/src/video_engine/main/source/vie_performance_monitor.h b/src/video_engine/vie_performance_monitor.h
similarity index 100%
rename from src/video_engine/main/source/vie_performance_monitor.h
rename to src/video_engine/vie_performance_monitor.h
diff --git a/src/video_engine/main/source/vie_receiver.cc b/src/video_engine/vie_receiver.cc
similarity index 100%
rename from src/video_engine/main/source/vie_receiver.cc
rename to src/video_engine/vie_receiver.cc
diff --git a/src/video_engine/main/source/vie_receiver.h b/src/video_engine/vie_receiver.h
similarity index 100%
rename from src/video_engine/main/source/vie_receiver.h
rename to src/video_engine/vie_receiver.h
diff --git a/src/video_engine/main/source/vie_ref_count.cc b/src/video_engine/vie_ref_count.cc
similarity index 100%
rename from src/video_engine/main/source/vie_ref_count.cc
rename to src/video_engine/vie_ref_count.cc
diff --git a/src/video_engine/main/source/vie_ref_count.h b/src/video_engine/vie_ref_count.h
similarity index 100%
rename from src/video_engine/main/source/vie_ref_count.h
rename to src/video_engine/vie_ref_count.h
diff --git a/src/video_engine/main/source/vie_render_impl.cc b/src/video_engine/vie_render_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_render_impl.cc
rename to src/video_engine/vie_render_impl.cc
diff --git a/src/video_engine/main/source/vie_render_impl.h b/src/video_engine/vie_render_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_render_impl.h
rename to src/video_engine/vie_render_impl.h
diff --git a/src/video_engine/main/source/vie_render_manager.cc b/src/video_engine/vie_render_manager.cc
similarity index 100%
rename from src/video_engine/main/source/vie_render_manager.cc
rename to src/video_engine/vie_render_manager.cc
diff --git a/src/video_engine/main/source/vie_render_manager.h b/src/video_engine/vie_render_manager.h
similarity index 100%
rename from src/video_engine/main/source/vie_render_manager.h
rename to src/video_engine/vie_render_manager.h
diff --git a/src/video_engine/main/source/vie_renderer.cc b/src/video_engine/vie_renderer.cc
similarity index 100%
rename from src/video_engine/main/source/vie_renderer.cc
rename to src/video_engine/vie_renderer.cc
diff --git a/src/video_engine/main/source/vie_renderer.h b/src/video_engine/vie_renderer.h
similarity index 100%
rename from src/video_engine/main/source/vie_renderer.h
rename to src/video_engine/vie_renderer.h
diff --git a/src/video_engine/main/source/vie_rtp_rtcp_impl.cc b/src/video_engine/vie_rtp_rtcp_impl.cc
similarity index 100%
rename from src/video_engine/main/source/vie_rtp_rtcp_impl.cc
rename to src/video_engine/vie_rtp_rtcp_impl.cc
diff --git a/src/video_engine/main/source/vie_rtp_rtcp_impl.h b/src/video_engine/vie_rtp_rtcp_impl.h
similarity index 100%
rename from src/video_engine/main/source/vie_rtp_rtcp_impl.h
rename to src/video_engine/vie_rtp_rtcp_impl.h
diff --git a/src/video_engine/main/source/vie_sender.cc b/src/video_engine/vie_sender.cc
similarity index 100%
rename from src/video_engine/main/source/vie_sender.cc
rename to src/video_engine/vie_sender.cc
diff --git a/src/video_engine/main/source/vie_sender.h b/src/video_engine/vie_sender.h
similarity index 100%
rename from src/video_engine/main/source/vie_sender.h
rename to src/video_engine/vie_sender.h
diff --git a/src/video_engine/main/source/vie_shared_data.cc b/src/video_engine/vie_shared_data.cc
similarity index 100%
rename from src/video_engine/main/source/vie_shared_data.cc
rename to src/video_engine/vie_shared_data.cc
diff --git a/src/video_engine/main/source/vie_shared_data.h b/src/video_engine/vie_shared_data.h
similarity index 100%
rename from src/video_engine/main/source/vie_shared_data.h
rename to src/video_engine/vie_shared_data.h
diff --git a/src/video_engine/main/source/vie_sync_module.cc b/src/video_engine/vie_sync_module.cc
similarity index 100%
rename from src/video_engine/main/source/vie_sync_module.cc
rename to src/video_engine/vie_sync_module.cc
diff --git a/src/video_engine/main/source/vie_sync_module.h b/src/video_engine/vie_sync_module.h
similarity index 100%
rename from src/video_engine/main/source/vie_sync_module.h
rename to src/video_engine/vie_sync_module.h