diff --git a/Android.mk b/Android.mk
index 9badb7ef3..03c5410bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/Android.mk
 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/main/source/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/G722/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/Android.mk b/src/modules/audio_coding/codecs/cng/Android.mk
similarity index 88%
rename from src/modules/audio_coding/codecs/CNG/main/source/Android.mk
rename to src/modules/audio_coding/codecs/cng/Android.mk
index 64b70bd4a..a3133e747 100644
--- a/src/modules/audio_coding/codecs/CNG/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/cng/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_PATH)/../../../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/cng.gypi b/src/modules/audio_coding/codecs/cng/cng.gypi
similarity index 63%
rename from src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
rename to src/modules/audio_coding/codecs/cng/cng.gypi
index d960b0016..d58520866 100644
--- a/src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
+++ b/src/modules/audio_coding/codecs/cng/cng.gypi
@@ -15,21 +15,38 @@
         '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../interface/webrtc_cng.h',
+        'include/webrtc_cng.h',
         'webrtc_cng.c',
         'cng_helpfuns.c',
         'cng_helpfuns.h',
       ],
     },
-  ],
+  ], # targets
+  'conditions': [
+    ['build_with_chromium==0', {
+      'targets': [
+        {
+          'target_name': 'cng_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'CNG',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+          ],
+          'sources': [
+            'cng_unittest.cc',
+          ],
+        }, # CNG_unittests
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/cng_helpfuns.c b/src/modules/audio_coding/codecs/cng/cng_helpfuns.c
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/source/cng_helpfuns.c
rename to src/modules/audio_coding/codecs/cng/cng_helpfuns.c
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/cng_helpfuns.h b/src/modules/audio_coding/codecs/cng/cng_helpfuns.h
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/source/cng_helpfuns.h
rename to src/modules/audio_coding/codecs/cng/cng_helpfuns.h
diff --git a/src/modules/audio_coding/codecs/cng/cng_unittest.cc b/src/modules/audio_coding/codecs/cng/cng_unittest.cc
new file mode 100644
index 000000000..6099fc9df
--- /dev/null
+++ b/src/modules/audio_coding/codecs/cng/cng_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 "webrtc_cng.h"
+
+
+
+
diff --git a/src/modules/audio_coding/codecs/CNG/main/interface/webrtc_cng.h b/src/modules/audio_coding/codecs/cng/include/webrtc_cng.h
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/interface/webrtc_cng.h
rename to src/modules/audio_coding/codecs/cng/include/webrtc_cng.h
diff --git a/src/modules/audio_coding/codecs/CNG/main/test/CNG.cpp b/src/modules/audio_coding/codecs/cng/test/CNG.cpp
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/test/CNG.cpp
rename to src/modules/audio_coding/codecs/cng/test/CNG.cpp
diff --git a/src/modules/audio_coding/codecs/CNG/main/test/StdAfx.cpp b/src/modules/audio_coding/codecs/cng/test/StdAfx.cpp
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/test/StdAfx.cpp
rename to src/modules/audio_coding/codecs/cng/test/StdAfx.cpp
diff --git a/src/modules/audio_coding/codecs/CNG/main/test/StdAfx.h b/src/modules/audio_coding/codecs/cng/test/StdAfx.h
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/test/StdAfx.h
rename to src/modules/audio_coding/codecs/cng/test/StdAfx.h
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/webrtc_cng.c b/src/modules/audio_coding/codecs/cng/webrtc_cng.c
similarity index 100%
rename from src/modules/audio_coding/codecs/CNG/main/source/webrtc_cng.c
rename to src/modules/audio_coding/codecs/cng/webrtc_cng.c
diff --git a/src/modules/audio_coding/main/source/Android.mk b/src/modules/audio_coding/main/source/Android.mk
index 7f87beee7..5c1c7cef5 100644
--- a/src/modules/audio_coding/main/source/Android.mk
+++ b/src/modules/audio_coding/main/source/Android.mk
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../codecs/CNG/main/interface \
+    $(LOCAL_PATH)/../../codecs/cng/include \
     $(LOCAL_PATH)/../../codecs/G711/main/interface \
     $(LOCAL_PATH)/../../codecs/G722/main/interface \
     $(LOCAL_PATH)/../../codecs/ilbc/interface \
diff --git a/src/modules/audio_coding/neteq/Android.mk b/src/modules/audio_coding/neteq/Android.mk
index 6947fcfd6..84267becf 100644
--- a/src/modules/audio_coding/neteq/Android.mk
+++ b/src/modules/audio_coding/neteq/Android.mk
@@ -58,7 +58,7 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
-    $(LOCAL_PATH)/../codecs/CNG/main/interface \
+    $(LOCAL_PATH)/../codecs/cng/include \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include 
 
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index a8e93a168..75440862c 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -9,7 +9,7 @@
 {
   'includes': [
     '../build/common.gypi',
-    'audio_coding/codecs/CNG/main/source/cng.gypi',
+    'audio_coding/codecs/cng/cng.gypi',
     'audio_coding/codecs/G711/main/source/g711.gypi',
     'audio_coding/codecs/G722/main/source/g722.gypi',
     'audio_coding/codecs/ilbc/ilbc.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 ed188474f..7f44f6d70 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
@@ -16,7 +16,7 @@ include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/resampler/
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/common_audio/signal_processing/Android.mk
 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/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/G722/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk