diff --git a/Android.mk b/Android.mk
index 7d1e7f7ae4..4d2ce387b7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/g711/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
diff --git a/src/modules/audio_coding/codecs/G711/main/source/Android.mk b/src/modules/audio_coding/codecs/g711/Android.mk
similarity index 87%
rename from src/modules/audio_coding/codecs/G711/main/source/Android.mk
rename to src/modules/audio_coding/codecs/g711/Android.mk
index 9d4fd553c4..779bb7c4f8 100644
--- a/src/modules/audio_coding/codecs/G711/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/g711/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -26,8 +26,8 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../../../..
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/../../../..
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_coding/codecs/G711/main/source/g711.c b/src/modules/audio_coding/codecs/g711/g711.c
similarity index 100%
rename from src/modules/audio_coding/codecs/G711/main/source/g711.c
rename to src/modules/audio_coding/codecs/g711/g711.c
diff --git a/src/modules/audio_coding/codecs/G711/main/source/g711.gypi b/src/modules/audio_coding/codecs/g711/g711.gypi
similarity index 73%
rename from src/modules/audio_coding/codecs/G711/main/source/g711.gypi
rename to src/modules/audio_coding/codecs/g711/g711.gypi
index 19e8a43ae8..0b5768c431 100644
--- a/src/modules/audio_coding/codecs/G711/main/source/g711.gypi
+++ b/src/modules/audio_coding/codecs/g711/g711.gypi
@@ -12,15 +12,15 @@
       'target_name': 'G711',
       'type': '<(library)',
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-       '../interface/g711_interface.h',
+        'include/g711_interface.h',
         'g711_interface.c',
         'g711.c',
         'g711.h',
@@ -28,9 +28,20 @@
     },
   ], # targets
   # Exclude the test target when building with chromium.
-  'conditions': [   
+  'conditions': [
     ['build_with_chromium==0', {
       'targets': [
+        {
+          'target_name': 'g711_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'G711',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+          ],
+          'sources': [
+            'g711_unittest.cc',
+          ],
+        },
         {
           'target_name': 'g711_test',
           'type': 'executable',
@@ -38,15 +49,8 @@
             'G711',
           ],
           'sources': [
-               '../testG711/testG711.cpp',
+            'test/testG711.cpp',
           ],
- #        'conditions': [
- #          ['OS=="linux"', {
- #          'cflags': [
- #            '-fexceptions', # enable exceptions
- #            ],
- #          }],
- #        ],
         },
       ], # targets
     }], # build_with_chromium
diff --git a/src/modules/audio_coding/codecs/G711/main/source/g711.h b/src/modules/audio_coding/codecs/g711/g711.h
similarity index 100%
rename from src/modules/audio_coding/codecs/G711/main/source/g711.h
rename to src/modules/audio_coding/codecs/g711/g711.h
diff --git a/src/modules/audio_coding/codecs/G711/main/source/g711_interface.c b/src/modules/audio_coding/codecs/g711/g711_interface.c
similarity index 100%
rename from src/modules/audio_coding/codecs/G711/main/source/g711_interface.c
rename to src/modules/audio_coding/codecs/g711/g711_interface.c
diff --git a/src/modules/audio_coding/codecs/g711/g711_unittest.cc b/src/modules/audio_coding/codecs/g711/g711_unittest.cc
new file mode 100644
index 0000000000..f5522556f4
--- /dev/null
+++ b/src/modules/audio_coding/codecs/g711/g711_unittest.cc
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * Empty test just to get code coverage metrics for this dir.
+ */
+#include "g711_interface.h"
+
+
+
+
diff --git a/src/modules/audio_coding/codecs/G711/main/interface/g711_interface.h b/src/modules/audio_coding/codecs/g711/include/g711_interface.h
similarity index 100%
rename from src/modules/audio_coding/codecs/G711/main/interface/g711_interface.h
rename to src/modules/audio_coding/codecs/g711/include/g711_interface.h
diff --git a/src/modules/audio_coding/codecs/G711/main/testG711/testG711.cpp b/src/modules/audio_coding/codecs/g711/test/testG711.cpp
similarity index 100%
rename from src/modules/audio_coding/codecs/G711/main/testG711/testG711.cpp
rename to src/modules/audio_coding/codecs/g711/test/testG711.cpp
diff --git a/src/modules/audio_coding/main/source/Android.mk b/src/modules/audio_coding/main/source/Android.mk
index 7e0354b0d0..7ecaed46a0 100644
--- a/src/modules/audio_coding/main/source/Android.mk
+++ b/src/modules/audio_coding/main/source/Android.mk
@@ -42,7 +42,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../codecs/cng/include \
-    $(LOCAL_PATH)/../../codecs/G711/main/interface \
+    $(LOCAL_PATH)/../../codecs/g711/include \
     $(LOCAL_PATH)/../../codecs/G722/main/interface \
     $(LOCAL_PATH)/../../codecs/ilbc/interface \
     $(LOCAL_PATH)/../../codecs/iSAC/main/interface \
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index 61ece85a87..dbc52e353a 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -10,7 +10,7 @@
   'includes': [
     '../build/common.gypi',
     'audio_coding/codecs/cng/cng.gypi',
-    'audio_coding/codecs/G711/main/source/g711.gypi',
+    'audio_coding/codecs/g711/g711.gypi',
     'audio_coding/codecs/G722/main/source/g722.gypi',
     'audio_coding/codecs/ilbc/ilbc.gypi',
     'audio_coding/codecs/iSAC/main/source/isac.gypi',
diff --git a/src/voice_engine/main/test/android/android_test/jni/Android.mk b/src/voice_engine/main/test/android/android_test/jni/Android.mk
index e0cd46a379..b78cf87dc2 100644
--- a/src/voice_engine/main/test/android/android_test/jni/Android.mk
+++ b/src/voice_engine/main/test/android/android_test/jni/Android.mk
@@ -17,7 +17,7 @@ include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/signal_pro
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/vad/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/NetEQ/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/g711/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk