diff --git a/src/modules/audio_coding/NetEQ/main/neteq_tests.gypi b/src/modules/audio_coding/NetEQ/main/neteq_tests.gypi
deleted file mode 100644
index 0199977f8..000000000
--- a/src/modules/audio_coding/NetEQ/main/neteq_tests.gypi
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'neteq_unittest',
-      'type': 'executable',
-      'dependencies': [
-        'NetEq',
-        'NetEqTestTools',
-        '<(webrtc_root)/../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'source/neteq_api_unittest.cc',
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/audio_coding/NetEQ/main/source/Android.mk b/src/modules/audio_coding/neteq/Android.mk
similarity index 85%
rename from src/modules/audio_coding/NetEQ/main/source/Android.mk
rename to src/modules/audio_coding/neteq/Android.mk
index fbf9e4da6..0af0f13e7 100644
--- a/src/modules/audio_coding/NetEQ/main/source/Android.mk
+++ b/src/modules/audio_coding/neteq/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
@@ -57,10 +57,10 @@ LOCAL_CFLAGS := \
     '-DNETEQ_VOICEENGINE_CODECS'
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../codecs/CNG/main/interface \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/interface \
+    $(LOCAL_PATH)/../codecs/CNG/main/interface \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_coding/NetEQ/OWNERS b/src/modules/audio_coding/neteq/OWNERS
similarity index 100%
rename from src/modules/audio_coding/NetEQ/OWNERS
rename to src/modules/audio_coding/neteq/OWNERS
diff --git a/src/modules/audio_coding/NetEQ/main/source/accelerate.c b/src/modules/audio_coding/neteq/accelerate.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/accelerate.c
rename to src/modules/audio_coding/neteq/accelerate.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/automode.c b/src/modules/audio_coding/neteq/automode.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/automode.c
rename to src/modules/audio_coding/neteq/automode.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/automode.h b/src/modules/audio_coding/neteq/automode.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/automode.h
rename to src/modules/audio_coding/neteq/automode.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/bgn_update.c b/src/modules/audio_coding/neteq/bgn_update.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/bgn_update.c
rename to src/modules/audio_coding/neteq/bgn_update.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/buffer_stats.h b/src/modules/audio_coding/neteq/buffer_stats.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/buffer_stats.h
rename to src/modules/audio_coding/neteq/buffer_stats.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/bufstats_decision.c b/src/modules/audio_coding/neteq/bufstats_decision.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/bufstats_decision.c
rename to src/modules/audio_coding/neteq/bufstats_decision.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/cng_internal.c b/src/modules/audio_coding/neteq/cng_internal.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/cng_internal.c
rename to src/modules/audio_coding/neteq/cng_internal.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/codec_db.c b/src/modules/audio_coding/neteq/codec_db.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/codec_db.c
rename to src/modules/audio_coding/neteq/codec_db.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/codec_db.h b/src/modules/audio_coding/neteq/codec_db.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/codec_db.h
rename to src/modules/audio_coding/neteq/codec_db.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/codec_db_defines.h b/src/modules/audio_coding/neteq/codec_db_defines.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/codec_db_defines.h
rename to src/modules/audio_coding/neteq/codec_db_defines.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/correlator.c b/src/modules/audio_coding/neteq/correlator.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/correlator.c
rename to src/modules/audio_coding/neteq/correlator.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/delay_logging.h b/src/modules/audio_coding/neteq/delay_logging.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/delay_logging.h
rename to src/modules/audio_coding/neteq/delay_logging.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/dsp.c b/src/modules/audio_coding/neteq/dsp.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dsp.c
rename to src/modules/audio_coding/neteq/dsp.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/dsp.h b/src/modules/audio_coding/neteq/dsp.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dsp.h
rename to src/modules/audio_coding/neteq/dsp.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/dsp_helpfunctions.c b/src/modules/audio_coding/neteq/dsp_helpfunctions.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dsp_helpfunctions.c
rename to src/modules/audio_coding/neteq/dsp_helpfunctions.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/dsp_helpfunctions.h b/src/modules/audio_coding/neteq/dsp_helpfunctions.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dsp_helpfunctions.h
rename to src/modules/audio_coding/neteq/dsp_helpfunctions.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/dtmf_buffer.c b/src/modules/audio_coding/neteq/dtmf_buffer.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dtmf_buffer.c
rename to src/modules/audio_coding/neteq/dtmf_buffer.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/dtmf_buffer.h b/src/modules/audio_coding/neteq/dtmf_buffer.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dtmf_buffer.h
rename to src/modules/audio_coding/neteq/dtmf_buffer.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/dtmf_tonegen.c b/src/modules/audio_coding/neteq/dtmf_tonegen.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dtmf_tonegen.c
rename to src/modules/audio_coding/neteq/dtmf_tonegen.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/dtmf_tonegen.h b/src/modules/audio_coding/neteq/dtmf_tonegen.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/dtmf_tonegen.h
rename to src/modules/audio_coding/neteq/dtmf_tonegen.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/expand.c b/src/modules/audio_coding/neteq/expand.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/expand.c
rename to src/modules/audio_coding/neteq/expand.c
diff --git a/src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq.h b/src/modules/audio_coding/neteq/interface/webrtc_neteq.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq.h
rename to src/modules/audio_coding/neteq/interface/webrtc_neteq.h
diff --git a/src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq_help_macros.h b/src/modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq_help_macros.h
rename to src/modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h
diff --git a/src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq_internal.h b/src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/interface/webrtc_neteq_internal.h
rename to src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/mcu.h b/src/modules/audio_coding/neteq/mcu.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mcu.h
rename to src/modules/audio_coding/neteq/mcu.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/mcu_address_init.c b/src/modules/audio_coding/neteq/mcu_address_init.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mcu_address_init.c
rename to src/modules/audio_coding/neteq/mcu_address_init.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/mcu_dsp_common.c b/src/modules/audio_coding/neteq/mcu_dsp_common.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mcu_dsp_common.c
rename to src/modules/audio_coding/neteq/mcu_dsp_common.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/mcu_dsp_common.h b/src/modules/audio_coding/neteq/mcu_dsp_common.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mcu_dsp_common.h
rename to src/modules/audio_coding/neteq/mcu_dsp_common.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/mcu_reset.c b/src/modules/audio_coding/neteq/mcu_reset.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mcu_reset.c
rename to src/modules/audio_coding/neteq/mcu_reset.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/merge.c b/src/modules/audio_coding/neteq/merge.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/merge.c
rename to src/modules/audio_coding/neteq/merge.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/min_distortion.c b/src/modules/audio_coding/neteq/min_distortion.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/min_distortion.c
rename to src/modules/audio_coding/neteq/min_distortion.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/mix_voice_unvoice.c b/src/modules/audio_coding/neteq/mix_voice_unvoice.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mix_voice_unvoice.c
rename to src/modules/audio_coding/neteq/mix_voice_unvoice.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/mute_signal.c b/src/modules/audio_coding/neteq/mute_signal.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/mute_signal.c
rename to src/modules/audio_coding/neteq/mute_signal.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq.gypi b/src/modules/audio_coding/neteq/neteq.gypi
similarity index 78%
rename from src/modules/audio_coding/NetEQ/main/source/neteq.gypi
rename to src/modules/audio_coding/neteq/neteq.gypi
index 0086f2835..801cb9975 100644
--- a/src/modules/audio_coding/NetEQ/main/source/neteq.gypi
+++ b/src/modules/audio_coding/neteq/neteq.gypi
@@ -20,17 +20,17 @@
         'SCRATCH',                  # specifies a subset of codecs to support.
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/webrtc_neteq.h',
-        '../interface/webrtc_neteq_help_macros.h',
-        '../interface/webrtc_neteq_internal.h',
+        'interface/webrtc_neteq.h',
+        'interface/webrtc_neteq_help_macros.h',
+        'interface/webrtc_neteq_internal.h',
         'accelerate.c',
         'automode.c',
         'automode.h',
@@ -85,9 +85,21 @@
     },
   ], # targets
   # Exclude the test target when building with chromium.
-  'conditions': [   
+  'conditions': [
     ['build_with_chromium==0', {
       'targets': [
+        {
+          'target_name': 'neteq_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'NetEq',
+            'NetEqTestTools',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'neteq_api_unittest.cc',
+          ],
+        }, # neteq_unittests
         {
           'target_name': 'NetEqRTPplay',
           'type': 'executable',
@@ -118,11 +130,11 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            './',
-            '../test',
+            '.',
+            'test',
           ],
           'sources': [
-            '../test/NetEqRTPplay.cc',
+            'test/NetEqRTPplay.cc',
           ],
         },
        {
@@ -155,80 +167,58 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            '../interface',
-            '../test',
+            'interface',
+            'test',
           ],
           'sources': [
-            '../test/RTPencode.cc',
+            'test/RTPencode.cc',
           ],
         },
         {
           'target_name': 'RTPjitter',
           'type': 'executable',
-          'dependencies': [
-          ],
-          'defines': [
-          ],
-          'include_dirs': [
-          ],
           'sources': [
-            '../test/RTPjitter.cc',
+            'test/RTPjitter.cc',
           ],
-       },
-       {
+        },
+        {
           'target_name': 'RTPanalyze',
           'type': 'executable',
           'dependencies': [
             'NetEqTestTools',
-         ],
-          'defines': [
           ],
-         'include_dirs': [
-         ],
           'sources': [
-            '../test/RTPanalyze.cc',
+            'test/RTPanalyze.cc',
           ],
-       },
+        },
         {
           'target_name': 'RTPchange',
           'type': 'executable',
           'dependencies': [
             'NetEqTestTools',
           ],
-          'defines': [
+          'sources': [
+           'test/RTPchange.cc',
           ],
-         'include_dirs': [
-          ],
-         'sources': [
-           '../test/RTPchange.cc',
-         ],
         },
         {
           'target_name': 'RTPtimeshift',
-         'type': 'executable',
+          'type': 'executable',
           'dependencies': [
            'NetEqTestTools',
           ],
-          'defines': [
-          ],
-          'include_dirs': [
-          ],
           'sources': [
-           '../test/RTPtimeshift.cc',
-         ],
-       },
+            'test/RTPtimeshift.cc',
+          ],
+        },
         {
           'target_name': 'RTPcat',
-         'type': 'executable',
-         'dependencies': [
-           'NetEqTestTools',
-         ],
-         'defines': [
+          'type': 'executable',
+          'dependencies': [
+            'NetEqTestTools',
           ],
-          'include_dirs': [
-         ],
-         'sources': [
-           '../test/RTPcat.cc',
+          'sources': [
+            'test/RTPcat.cc',
           ],
         },
         {
@@ -245,8 +235,8 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '../test',
-              '../interface',
+              'interface',
+              'test',
             ],
           },
           'defines': [
@@ -266,25 +256,29 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            './',
-            '../interface',
-            '../test',
+            'interface',
+            'test',
           ],
           'sources': [
-            '../test/NETEQTEST_NetEQClass.cc',
-            '../test/NETEQTEST_RTPpacket.cc',
-            '../test/NETEQTEST_CodecClass.cc',
-            '../test/NETEQTEST_NetEQClass.h',
-            '../test/NETEQTEST_RTPpacket.h',
-            '../test/NETEQTEST_CodecClass.h',
+            'test/NETEQTEST_NetEQClass.cc',
+            'test/NETEQTEST_RTPpacket.cc',
+            'test/NETEQTEST_CodecClass.cc',
+            'test/NETEQTEST_NetEQClass.h',
+            'test/NETEQTEST_RTPpacket.h',
+            'test/NETEQTEST_CodecClass.h',
           ],
           'conditions': [
-            ['OS=="linux"', {
-             'cflags': [
-               '-fexceptions', # enable exceptions
+            ['OS=="linux" or OS=="mac"', {
+              'cflags': [
+                '-fexceptions', # enable exceptions
               ],
-           }],
-          ],
+            }],
+            ['OS=="mac"', {
+              'xcode_settings': {
+                'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', # -fexceptions
+               }
+            }],
+          ], # conditions
         },
       ], # targets
     }], # build_with_chromium
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq_api_unittest.cc b/src/modules/audio_coding/neteq/neteq_api_unittest.cc
similarity index 92%
rename from src/modules/audio_coding/NetEQ/main/source/neteq_api_unittest.cc
rename to src/modules/audio_coding/neteq/neteq_api_unittest.cc
index 62e427147..1e757e0e5 100644
--- a/src/modules/audio_coding/NetEQ/main/source/neteq_api_unittest.cc
+++ b/src/modules/audio_coding/neteq/neteq_api_unittest.cc
@@ -20,12 +20,12 @@
 
 #include "gtest/gtest.h"
 
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.h"
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.h"
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
 #include "typedefs.h"  // NOLINT(build/include)
-#include "modules/audio_coding/NetEQ/main/interface/webrtc_neteq.h"
-#include "modules/audio_coding/NetEQ/main/interface/webrtc_neteq_help_macros.h"
+#include "modules/audio_coding/neteq/interface/webrtc_neteq.h"
+#include "modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h"
 
 namespace {
 
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq_defines.h b/src/modules/audio_coding/neteq/neteq_defines.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/neteq_defines.h
rename to src/modules/audio_coding/neteq/neteq_defines.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq_error_codes.h b/src/modules/audio_coding/neteq/neteq_error_codes.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/neteq_error_codes.h
rename to src/modules/audio_coding/neteq/neteq_error_codes.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq_statistics.h b/src/modules/audio_coding/neteq/neteq_statistics.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/neteq_statistics.h
rename to src/modules/audio_coding/neteq/neteq_statistics.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/normal.c b/src/modules/audio_coding/neteq/normal.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/normal.c
rename to src/modules/audio_coding/neteq/normal.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/packet_buffer.c b/src/modules/audio_coding/neteq/packet_buffer.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/packet_buffer.c
rename to src/modules/audio_coding/neteq/packet_buffer.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/packet_buffer.h b/src/modules/audio_coding/neteq/packet_buffer.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/packet_buffer.h
rename to src/modules/audio_coding/neteq/packet_buffer.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/peak_detection.c b/src/modules/audio_coding/neteq/peak_detection.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/peak_detection.c
rename to src/modules/audio_coding/neteq/peak_detection.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/preemptive_expand.c b/src/modules/audio_coding/neteq/preemptive_expand.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/preemptive_expand.c
rename to src/modules/audio_coding/neteq/preemptive_expand.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/random_vector.c b/src/modules/audio_coding/neteq/random_vector.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/random_vector.c
rename to src/modules/audio_coding/neteq/random_vector.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/recin.c b/src/modules/audio_coding/neteq/recin.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/recin.c
rename to src/modules/audio_coding/neteq/recin.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/recout.c b/src/modules/audio_coding/neteq/recout.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/recout.c
rename to src/modules/audio_coding/neteq/recout.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/rtcp.c b/src/modules/audio_coding/neteq/rtcp.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/rtcp.c
rename to src/modules/audio_coding/neteq/rtcp.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/rtcp.h b/src/modules/audio_coding/neteq/rtcp.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/rtcp.h
rename to src/modules/audio_coding/neteq/rtcp.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/rtp.c b/src/modules/audio_coding/neteq/rtp.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/rtp.c
rename to src/modules/audio_coding/neteq/rtp.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/rtp.h b/src/modules/audio_coding/neteq/rtp.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/rtp.h
rename to src/modules/audio_coding/neteq/rtp.h
diff --git a/src/modules/audio_coding/NetEQ/main/source/set_fs.c b/src/modules/audio_coding/neteq/set_fs.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/set_fs.c
rename to src/modules/audio_coding/neteq/set_fs.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/signal_mcu.c b/src/modules/audio_coding/neteq/signal_mcu.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/signal_mcu.c
rename to src/modules/audio_coding/neteq/signal_mcu.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/split_and_insert.c b/src/modules/audio_coding/neteq/split_and_insert.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/split_and_insert.c
rename to src/modules/audio_coding/neteq/split_and_insert.c
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.cc b/src/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.cc
rename to src/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.h b/src/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.h
rename to src/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.cc
rename to src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.h b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.h
rename to src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.cc b/src/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.cc
rename to src/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.h b/src/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.h
rename to src/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
diff --git a/src/modules/audio_coding/NetEQ/main/test/NetEqRTPplay.cc b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/NetEqRTPplay.cc
rename to src/modules/audio_coding/neteq/test/NetEqRTPplay.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/PayloadTypes.h b/src/modules/audio_coding/neteq/test/PayloadTypes.h
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/PayloadTypes.h
rename to src/modules/audio_coding/neteq/test/PayloadTypes.h
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc b/src/modules/audio_coding/neteq/test/RTPanalyze.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc
rename to src/modules/audio_coding/neteq/test/RTPanalyze.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPcat.cc b/src/modules/audio_coding/neteq/test/RTPcat.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPcat.cc
rename to src/modules/audio_coding/neteq/test/RTPcat.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPchange.cc b/src/modules/audio_coding/neteq/test/RTPchange.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPchange.cc
rename to src/modules/audio_coding/neteq/test/RTPchange.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPencode.cc b/src/modules/audio_coding/neteq/test/RTPencode.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPencode.cc
rename to src/modules/audio_coding/neteq/test/RTPencode.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPjitter.cc b/src/modules/audio_coding/neteq/test/RTPjitter.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPjitter.cc
rename to src/modules/audio_coding/neteq/test/RTPjitter.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPtimeshift.cc b/src/modules/audio_coding/neteq/test/RTPtimeshift.cc
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/RTPtimeshift.cc
rename to src/modules/audio_coding/neteq/test/RTPtimeshift.cc
diff --git a/src/modules/audio_coding/NetEQ/main/test/delay_tool/parse_delay_file.m b/src/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/delay_tool/parse_delay_file.m
rename to src/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
diff --git a/src/modules/audio_coding/NetEQ/main/test/delay_tool/plot_neteq_delay.m b/src/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/delay_tool/plot_neteq_delay.m
rename to src/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
diff --git a/src/modules/audio_coding/NetEQ/main/test/ptypes.txt b/src/modules/audio_coding/neteq/test/ptypes.txt
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/test/ptypes.txt
rename to src/modules/audio_coding/neteq/test/ptypes.txt
diff --git a/src/modules/audio_coding/NetEQ/main/source/unmute_signal.c b/src/modules/audio_coding/neteq/unmute_signal.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/unmute_signal.c
rename to src/modules/audio_coding/neteq/unmute_signal.c
diff --git a/src/modules/audio_coding/NetEQ/main/source/webrtc_neteq.c b/src/modules/audio_coding/neteq/webrtc_neteq.c
similarity index 100%
rename from src/modules/audio_coding/NetEQ/main/source/webrtc_neteq.c
rename to src/modules/audio_coding/neteq/webrtc_neteq.c
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index c5b0bc266..a8e93a168 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -17,7 +17,7 @@
     'audio_coding/codecs/iSAC/fix/source/isacfix.gypi',
     'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi',
     'audio_coding/main/source/audio_coding_module.gypi',
-    'audio_coding/NetEQ/main/source/neteq.gypi',
+    'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
     'audio_device/main/source/audio_device.gypi',
     'audio_processing/audio_processing.gypi',
@@ -45,7 +45,6 @@
       'includes': [
         'audio_coding/codecs/iSAC/isac_test.gypi',
         'audio_coding/codecs/iSAC/isacfix_test.gypi',
-        'audio_coding/NetEQ/main/neteq_tests.gypi',
         'audio_processing/apm_tests.gypi',
         'rtp_rtcp/source/rtp_rtcp_tests.gypi',
         'rtp_rtcp/test/test_bwe/test_bwe.gypi',