diff --git a/Android.mk b/Android.mk
index 5053e7d..f804089 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1 +1,58 @@
-include $(call all-subdir-makefiles)
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+aacdec_sources := $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp)
+aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
+
+aacenc_sources := $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp)
+aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
+
+pcmutils_sources := $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp)
+pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
+
+fdk_sources := $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp)
+fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
+
+sys_sources := $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp)
+sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
+
+mpegtpdec_sources := $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp)
+mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
+
+mpegtpenc_sources := $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp)
+mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
+
+sbrdec_sources := $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp)
+sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
+
+sbrenc_sources := $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp)
+sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
+
+LOCAL_SRC_FILES := \
+        $(aacdec_sources:%=libAACdec/src/%) \
+        $(aacenc_sources:%=libAACenc/src/%) \
+        $(pcmutils_sources:%=libPCMutils/src/%) \
+        $(fdk_sources:%=libFDK/src/%) \
+        $(sys_sources:%=libSYS/src/%) \
+        $(mpegtpdec_sources:%=libMpegTPDec/src/%) \
+        $(mpegtpenc_sources:%=libMpegTPEnc/src/%) \
+        $(sbrdec_sources:%=libSBRdec/src/%) \
+        $(sbrenc_sources:%=libSBRenc/src/%)
+
+LOCAL_CFLAGS := -DANDROID
+LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
+
+LOCAL_C_INCLUDES := \
+        $(LOCAL_PATH)/libAACdec/include \
+        $(LOCAL_PATH)/libAACenc/include \
+        $(LOCAL_PATH)/libPCMutils/include \
+        $(LOCAL_PATH)/libFDK/include \
+        $(LOCAL_PATH)/libSYS/include \
+        $(LOCAL_PATH)/libMpegTPDec/include \
+        $(LOCAL_PATH)/libMpegTPEnc/include \
+        $(LOCAL_PATH)/libSBRdec/include \
+        $(LOCAL_PATH)/libSBRenc/include
+
+LOCAL_MODULE:= libFraunhoferAAC
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/MODULE_LICENSE_FRAUNHOFER b/MODULE_LICENSE_FRAUNHOFER
new file mode 100644
index 0000000..e69de29
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..b3488cc
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,80 @@
+Software License for The Fraunhofer FDK AAC Codec Library for Android
+
+© Copyright  1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+  All rights reserved.
+
+1.    INTRODUCTION
+The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
+the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
+This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
+
+AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
+audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
+independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
+of the MPEG specifications.
+
+Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
+may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
+individually for the purpose of encoding or decoding bit streams in products that are compliant with
+the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
+these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
+software may already be covered under those patent licenses when it is used for those licensed purposes only.
+
+Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
+are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
+applications information and documentation.
+
+2.    COPYRIGHT LICENSE
+
+Redistribution and use in source and binary forms, with or without modification, are permitted without
+payment of copyright license fees provided that you satisfy the following conditions:
+
+You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
+your modifications thereto in source code form.
+
+You must retain the complete text of this software license in the documentation and/or other materials
+provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
+You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
+modifications thereto to recipients of copies in binary form.
+
+The name of Fraunhofer may not be used to endorse or promote products derived from this library without
+prior written permission.
+
+You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
+software or your modifications thereto.
+
+Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
+and the date of any change. For modified versions of the FDK AAC Codec, the term
+"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
+"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
+
+3.    NO PATENT LICENSE
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
+ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
+respect to this software.
+
+You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
+by appropriate patent licenses.
+
+4.    DISCLAIMER
+
+This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
+"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
+of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
+including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
+or business interruption, however caused and on any theory of liability, whether in contract, strict
+liability, or tort (including negligence), arising in any way out of the use of this software, even if
+advised of the possibility of such damage.
+
+5.    CONTACT INFORMATION
+
+Fraunhofer Institute for Integrated Circuits IIS
+Attention: Audio and Multimedia Departments - FDK AAC LL
+Am Wolfsmantel 33
+91058 Erlangen, Germany
+
+www.iis.fraunhofer.de/amm
+amm-info@iis.fraunhofer.de
+
diff --git a/libAACdec/Android.mk b/libAACdec/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libAACdec/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libAACdec/src/Android.mk b/libAACdec/src/Android.mk
deleted file mode 100644
index ae53694..0000000
--- a/libAACdec/src/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        aacdec_drc.cpp \
-        aacdec_hcr.cpp \
-        aacdecoder.cpp \
-        aacdec_pns.cpp \
-        aac_ram.cpp \
-        block.cpp \
-        channelinfo.cpp \
-        ldfiltbank.cpp \
-        rvlcbit.cpp \
-        rvlc.cpp \
-        aacdec_hcr_bit.cpp \
-        aacdec_hcrs.cpp \
-        aacdecoder_lib.cpp \
-        aacdec_tns.cpp \
-        aac_rom.cpp \
-        channel.cpp \
-        conceal.cpp \
-        pulsedata.cpp \
-        rvlcconceal.cpp \
-        stereo.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libPCMutils/include \
-        $(LOCAL_PATH)/../../libFDK/include \
-        $(LOCAL_PATH)/../../libSYS/include \
-        $(LOCAL_PATH)/../../libMpegTPDec/include \
-        $(LOCAL_PATH)/../../libSBRdec/include
-
-LOCAL_MODULE:= libAACdec
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libAACenc/Android.mk b/libAACenc/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libAACenc/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libAACenc/src/Android.mk b/libAACenc/src/Android.mk
deleted file mode 100644
index d3bbb9b..0000000
--- a/libAACenc/src/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        aacenc.cpp \
-        aacEnc_ram.cpp \
-        band_nrg.cpp \
-        block_switch.cpp \
-        grp_data.cpp \
-        metadata_main.cpp \
-        pre_echo_control.cpp \
-        quantize.cpp \
-        tonality.cpp \
-        aacenc_hcr.cpp \
-        aacEnc_rom.cpp \
-        bandwidth.cpp \
-        channel_map.cpp \
-        intensity.cpp \
-        ms_stereo.cpp \
-        psy_configuration.cpp \
-        sf_estim.cpp \
-        transform.cpp \
-        aacenc_lib.cpp \
-        aacenc_tns.cpp \
-        bit_cnt.cpp \
-        chaosmeasure.cpp \
-        line_pe.cpp \
-        noisedet.cpp \
-        psy_main.cpp \
-        spreading.cpp \
-        aacenc_pns.cpp \
-        adj_thr.cpp \
-        bitenc.cpp \
-        dyn_bits.cpp \
-        metadata_compressor.cpp \
-        pnsparam.cpp \
-        qc_main.cpp \
-        tns_param.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libPCMutils/include \
-        $(LOCAL_PATH)/../../libFDK/include \
-        $(LOCAL_PATH)/../../libSYS/include \
-        $(LOCAL_PATH)/../../libMpegTPEnc/include \
-        $(LOCAL_PATH)/../../libSBRenc/include
-
-LOCAL_MODULE:= libAACenc
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libFDK/Android.mk b/libFDK/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libFDK/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libFDK/src/Android.mk b/libFDK/src/Android.mk
deleted file mode 100644
index 44309ed..0000000
--- a/libFDK/src/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        autocorr2nd.cpp \
-        dct.cpp \
-        FDK_bitbuffer.cpp \
-        FDK_core.cpp \
-        FDK_crc.cpp \
-        FDK_hybrid.cpp \
-        FDK_tools_rom.cpp \
-        FDK_trigFcts.cpp \
-        fft.cpp \
-        fft_rad2.cpp \
-        fixpoint_math.cpp \
-        mdct.cpp \
-        qmf.cpp \
-        scale.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libSYS/include \
-
-LOCAL_MODULE:= libFDK
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libMpegTPDec/Android.mk b/libMpegTPDec/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libMpegTPDec/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libMpegTPDec/src/Android.mk b/libMpegTPDec/src/Android.mk
deleted file mode 100644
index ae9096d..0000000
--- a/libMpegTPDec/src/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        tpdec_adif.cpp \
-        tpdec_adts.cpp \
-        tpdec_asc.cpp \
-        tpdec_latm.cpp \
-        tpdec_lib.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libSYS/include \
-        $(LOCAL_PATH)/../../libFDK/include
-
-LOCAL_MODULE:= libMpegTPDec
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libMpegTPEnc/Android.mk b/libMpegTPEnc/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libMpegTPEnc/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libMpegTPEnc/src/Android.mk b/libMpegTPEnc/src/Android.mk
deleted file mode 100644
index 5d6d7e0..0000000
--- a/libMpegTPEnc/src/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        tpenc_adif.cpp \
-        tpenc_adts.cpp \
-        tpenc_asc.cpp \
-        tpenc_latm.cpp \
-        tpenc_lib.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libSYS/include \
-        $(LOCAL_PATH)/../../libFDK/include
-
-LOCAL_MODULE:= libMpegTPEnc
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libPCMutils/Android.mk b/libPCMutils/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libPCMutils/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libPCMutils/src/Android.mk b/libPCMutils/src/Android.mk
deleted file mode 100644
index 174581c..0000000
--- a/libPCMutils/src/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := pcmutils_lib.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libSYS/include \
-        $(LOCAL_PATH)/../../libFDK/include
-
-LOCAL_MODULE:= libPCMutils
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libSBRdec/Android.mk b/libSBRdec/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libSBRdec/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libSBRdec/src/Android.mk b/libSBRdec/src/Android.mk
deleted file mode 100644
index 21162b9..0000000
--- a/libSBRdec/src/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        env_calc.cpp \
-        env_dec.cpp \
-        env_extr.cpp \
-        huff_dec.cpp \
-        lpp_tran.cpp \
-        psbitdec.cpp \
-        psdec.cpp \
-        psdec_hybrid.cpp \
-        sbr_crc.cpp \
-        sbr_deb.cpp \
-        sbr_dec.cpp \
-        sbrdec_drc.cpp \
-        sbrdec_freq_sca.cpp \
-        sbrdecoder.cpp \
-        sbr_ram.cpp \
-        sbr_rom.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libFDK/include \
-        $(LOCAL_PATH)/../../libSYS/include
-
-LOCAL_MODULE:= libSBRdec
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libSBRenc/Android.mk b/libSBRenc/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libSBRenc/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libSBRenc/src/Android.mk b/libSBRenc/src/Android.mk
deleted file mode 100644
index 0a3a9d8..0000000
--- a/libSBRenc/src/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        bit_sbr.cpp \
-        env_bit.cpp \
-        fram_gen.cpp \
-        mh_det.cpp \
-        ps_bitenc.cpp \
-        ps_encode.cpp \
-        resampler.cpp \
-        sbr_encoder.cpp \
-        sbr_ram.cpp \
-        ton_corr.cpp \
-        code_env.cpp \
-        env_est.cpp \
-        invf_est.cpp \
-        nf_est.cpp \
-        ps_main.cpp \
-        sbrenc_freq_sca.cpp \
-        sbr_misc.cpp \
-        sbr_rom.cpp \
-        tran_det.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libFDK/include \
-        $(LOCAL_PATH)/../../libSYS/include
-
-LOCAL_MODULE:= libSBRenc
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libSYS/Android.mk b/libSYS/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/libSYS/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libSYS/src/Android.mk b/libSYS/src/Android.mk
deleted file mode 100644
index 5078535..0000000
--- a/libSYS/src/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-        cmdl_parser.cpp \
-        conv_string.cpp \
-        genericStds.cpp \
-        wav_file.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/../include \
-        $(LOCAL_PATH)/../../libFDK/include
-
-LOCAL_MODULE:= libSYS
-
-include $(BUILD_STATIC_LIBRARY)