75 files changed, 93 insertions, 110 deletions
diff --git a/.gitignore b/.gitignore
index 7f9475fb..3431b2f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,5 @@ tests/*test
 tools/celtdec
 tools/celtenc
 celt.pc
-libcelt.spec
-libcelt/dump_modes/dump_modes
+celt.spec
+celt/dump_modes/dump_modes
diff --git a/Makefile.am b/Makefile.am
index 612498ed..bfd4061b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 lib_LTLIBRARIES = libopus.la
 
-SUBDIRS = . libcelt/tests doc
+SUBDIRS = . celt/tests doc
 
-INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
+INCLUDES = -I$(top_srcdir)/celt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
 
 include celt_sources.mk
 include silk_sources.mk
@@ -22,7 +22,7 @@ include opus_headers.txt
 
 libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES)
 
-pkginclude_HEADERS = src/opus.h src/opus_multistream.h libcelt/opus_types.h libcelt/opus_defines.h
+pkginclude_HEADERS = src/opus.h src/opus_multistream.h celt/opus_types.h celt/opus_defines.h
 
 noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD)
 
@@ -37,9 +37,9 @@ test_repacketizer_SOURCES = src/test_repacketizer.c
 test_repacketizer_LDADD = libopus.la -lm
 
 if CUSTOM_MODES
-pkginclude_HEADERS += libcelt/opus_custom.h
+pkginclude_HEADERS += celt/opus_custom.h
 noinst_PROGRAMS += test_opus_custom
-test_opus_custom_SOURCES = libcelt/test_opus_custom.c
+test_opus_custom_SOURCES = celt/test_opus_custom.c
 test_opus_custom_LDADD = libopus.la -lm
 endif
 
diff --git a/Makefile.draft b/Makefile.draft
index dba78fd9..37d62fc0 100644
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -74,7 +74,7 @@ ARCHIVE.cmdline     = $(AR) $(ARFLAGS) $@ $^ && $(RANLIB) $@
 CINCLUDES += silk/ \
         silk/float/ \
         silk/fixed/ \
-	libcelt/ \
+	celt/ \
 	src/
 
 # VPATH e.g. VPATH = src:../headers
diff --git a/libcelt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index d0631fa4..d0631fa4 100644
--- a/libcelt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
diff --git a/libcelt/arch.h b/celt/arch.h
index 08286e94..08286e94 100644
--- a/libcelt/arch.h
+++ b/celt/arch.h
diff --git a/libcelt/bands.c b/celt/bands.c
index f89a94e4..f89a94e4 100644
--- a/libcelt/bands.c
+++ b/celt/bands.c
diff --git a/libcelt/bands.h b/celt/bands.h
index 25c0a00e..25c0a00e 100644
--- a/libcelt/bands.h
+++ b/celt/bands.h
diff --git a/libcelt/celt.c b/celt/celt.c
index 50cc434f..50cc434f 100644
--- a/libcelt/celt.c
+++ b/celt/celt.c
diff --git a/libcelt/celt.h b/celt/celt.h
index 7a1063c8..7a1063c8 100644
--- a/libcelt/celt.h
+++ b/celt/celt.h
diff --git a/libcelt/libcelt.vcxproj b/celt/celt.vcxproj
index 6be1813d..a5976620 100644
--- a/libcelt/libcelt.vcxproj
+++ b/celt/celt.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{245603E3-F580-41A5-9632-B25FE3372CBF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libcelt</RootNamespace>
+    <RootNamespace>celt</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -122,4 +122,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/libcelt/libcelt.vcxproj.filters b/celt/celt.vcxproj.filters
index 4e650b91..4e650b91 100644
--- a/libcelt/libcelt.vcxproj.filters
+++ b/celt/celt.vcxproj.filters
diff --git a/libcelt/cwrs.c b/celt/cwrs.c
index 91be9800..91be9800 100644
--- a/libcelt/cwrs.c
+++ b/celt/cwrs.c
diff --git a/libcelt/cwrs.h b/celt/cwrs.h
index 77123943..77123943 100644
--- a/libcelt/cwrs.h
+++ b/celt/cwrs.h
diff --git a/libcelt/dump_modes/Makefile b/celt/dump_modes/Makefile
index 3993f533..3993f533 100644
--- a/libcelt/dump_modes/Makefile
+++ b/celt/dump_modes/Makefile
diff --git a/libcelt/dump_modes/dump_modes.c b/celt/dump_modes/dump_modes.c
index ab37ac78..ab37ac78 100644
--- a/libcelt/dump_modes/dump_modes.c
+++ b/celt/dump_modes/dump_modes.c
diff --git a/libcelt/ecintrin.h b/celt/ecintrin.h
index be229470..be229470 100644
--- a/libcelt/ecintrin.h
+++ b/celt/ecintrin.h
diff --git a/libcelt/entcode.c b/celt/entcode.c
index 0d9c7fc5..0d9c7fc5 100644
--- a/libcelt/entcode.c
+++ b/celt/entcode.c
diff --git a/libcelt/entcode.h b/celt/entcode.h
index 2792ada9..2792ada9 100644
--- a/libcelt/entcode.h
+++ b/celt/entcode.h
diff --git a/libcelt/entdec.c b/celt/entdec.c
index ba224e24..ba224e24 100644
--- a/libcelt/entdec.c
+++ b/celt/entdec.c
diff --git a/libcelt/entdec.h b/celt/entdec.h
index 719fdb24..719fdb24 100644
--- a/libcelt/entdec.h
+++ b/celt/entdec.h
diff --git a/libcelt/entenc.c b/celt/entenc.c
index bff2d899..bff2d899 100644
--- a/libcelt/entenc.c
+++ b/celt/entenc.c
diff --git a/libcelt/entenc.h b/celt/entenc.h
index d65d734c..d65d734c 100644
--- a/libcelt/entenc.h
+++ b/celt/entenc.h
diff --git a/libcelt/fixed_c5x.h b/celt/fixed_c5x.h
index 1672f22a..1672f22a 100644
--- a/libcelt/fixed_c5x.h
+++ b/celt/fixed_c5x.h
diff --git a/libcelt/fixed_c6x.h b/celt/fixed_c6x.h
index 746fe081..746fe081 100644
--- a/libcelt/fixed_c6x.h
+++ b/celt/fixed_c6x.h
diff --git a/libcelt/fixed_debug.h b/celt/fixed_debug.h
index 2f19d10f..2f19d10f 100644
--- a/libcelt/fixed_debug.h
+++ b/celt/fixed_debug.h
diff --git a/libcelt/fixed_generic.h b/celt/fixed_generic.h
index 3934f4e0..3934f4e0 100644
--- a/libcelt/fixed_generic.h
+++ b/celt/fixed_generic.h
diff --git a/libcelt/float_cast.h b/celt/float_cast.h
index b3670f0b..b3670f0b 100644
--- a/libcelt/float_cast.h
+++ b/celt/float_cast.h
diff --git a/libcelt/kiss_fft.c b/celt/kiss_fft.c
index e9af132c..e9af132c 100644
--- a/libcelt/kiss_fft.c
+++ b/celt/kiss_fft.c
diff --git a/libcelt/kiss_fft.h b/celt/kiss_fft.h
index 95adf055..95adf055 100644
--- a/libcelt/kiss_fft.h
+++ b/celt/kiss_fft.h
diff --git a/libcelt/laplace.c b/celt/laplace.c
index 53673130..53673130 100644
--- a/libcelt/laplace.c
+++ b/celt/laplace.c
diff --git a/libcelt/laplace.h b/celt/laplace.h
index 66ef4928..66ef4928 100644
--- a/libcelt/laplace.h
+++ b/celt/laplace.h
diff --git a/libcelt/mathops.c b/celt/mathops.c
index 9163eed1..9163eed1 100644
--- a/libcelt/mathops.c
+++ b/celt/mathops.c
diff --git a/libcelt/mathops.h b/celt/mathops.h
index 4944391b..4944391b 100644
--- a/libcelt/mathops.h
+++ b/celt/mathops.h
diff --git a/libcelt/mdct.c b/celt/mdct.c
index 72011305..72011305 100644
--- a/libcelt/mdct.c
+++ b/celt/mdct.c
diff --git a/libcelt/mdct.h b/celt/mdct.h
index bba627cc..bba627cc 100644
--- a/libcelt/mdct.h
+++ b/celt/mdct.h
diff --git a/libcelt/mfrngcod.h b/celt/mfrngcod.h
index 6af128a6..6af128a6 100644
--- a/libcelt/mfrngcod.h
+++ b/celt/mfrngcod.h
diff --git a/libcelt/modes.c b/celt/modes.c
index 0c3e374e..0c3e374e 100644
--- a/libcelt/modes.c
+++ b/celt/modes.c
diff --git a/libcelt/modes.h b/celt/modes.h
index afd71b3c..afd71b3c 100644
--- a/libcelt/modes.h
+++ b/celt/modes.h
diff --git a/libcelt/opus_custom.h b/celt/opus_custom.h
index 1391de79..1391de79 100644
--- a/libcelt/opus_custom.h
+++ b/celt/opus_custom.h
diff --git a/libcelt/opus_defines.h b/celt/opus_defines.h
index c72edcc3..c72edcc3 100644
--- a/libcelt/opus_defines.h
+++ b/celt/opus_defines.h
diff --git a/libcelt/opus_types.h b/celt/opus_types.h
index ad0b9dd9..ad0b9dd9 100644
--- a/libcelt/opus_types.h
+++ b/celt/opus_types.h
diff --git a/libcelt/os_support.h b/celt/os_support.h
index 2484f0b2..2484f0b2 100644
--- a/libcelt/os_support.h
+++ b/celt/os_support.h
diff --git a/libcelt/pitch.c b/celt/pitch.c
index f6a97f9b..f6a97f9b 100644
--- a/libcelt/pitch.c
+++ b/celt/pitch.c
diff --git a/libcelt/pitch.h b/celt/pitch.h
index bdfa4d0e..bdfa4d0e 100644
--- a/libcelt/pitch.h
+++ b/celt/pitch.h
diff --git a/libcelt/plc.c b/celt/plc.c
index c9a407ca..c9a407ca 100644
--- a/libcelt/plc.c
+++ b/celt/plc.c
diff --git a/libcelt/plc.h b/celt/plc.h
index fd762cd7..fd762cd7 100644
--- a/libcelt/plc.h
+++ b/celt/plc.h
diff --git a/libcelt/quant_bands.c b/celt/quant_bands.c
index 9927a189..9927a189 100644
--- a/libcelt/quant_bands.c
+++ b/celt/quant_bands.c
diff --git a/libcelt/quant_bands.h b/celt/quant_bands.h
index 9eeae4b3..9eeae4b3 100644
--- a/libcelt/quant_bands.h
+++ b/celt/quant_bands.h
diff --git a/libcelt/rate.c b/celt/rate.c
index 987dffda..987dffda 100644
--- a/libcelt/rate.c
+++ b/celt/rate.c
diff --git a/libcelt/rate.h b/celt/rate.h
index d19d0b30..d19d0b30 100644
--- a/libcelt/rate.h
+++ b/celt/rate.h
diff --git a/libcelt/stack_alloc.h b/celt/stack_alloc.h
index 512f5292..512f5292 100644
--- a/libcelt/stack_alloc.h
+++ b/celt/stack_alloc.h
diff --git a/libcelt/static_modes_fixed.h b/celt/static_modes_fixed.h
index 98f27559..98f27559 100644
--- a/libcelt/static_modes_fixed.h
+++ b/celt/static_modes_fixed.h
diff --git a/libcelt/static_modes_float.h b/celt/static_modes_float.h
index fcb24f4b..fcb24f4b 100644
--- a/libcelt/static_modes_float.h
+++ b/celt/static_modes_float.h
diff --git a/libcelt/test_opus_custom.c b/celt/test_opus_custom.c
index 741d2bd5..741d2bd5 100644
--- a/libcelt/test_opus_custom.c
+++ b/celt/test_opus_custom.c
diff --git a/libcelt/tests/Makefile.am b/celt/tests/Makefile.am
index 55dcb95f..9c4d899a 100644
--- a/libcelt/tests/Makefile.am
+++ b/celt/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libcelt
+INCLUDES = -I$(top_srcdir)/celt
 METASOURCES = AUTO
 
 TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test rotation-test
diff --git a/libcelt/tests/cwrs32-test.c b/celt/tests/cwrs32-test.c
index b8885d6c..ee733154 100644
--- a/libcelt/tests/cwrs32-test.c
+++ b/celt/tests/cwrs32-test.c
@@ -6,13 +6,13 @@
 #include <string.h>
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/cwrs.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/rate.h"
+#include "../celt/stack_alloc.h"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
+#include "../celt/cwrs.c"
+#include "../celt/mathops.c"
+#include "../celt/rate.h"
 
 #define NMAX (240)
 #define KMAX (128)
diff --git a/libcelt/tests/dft-test.c b/celt/tests/dft-test.c
index 2e2491af..1bf4e74c 100644
--- a/libcelt/tests/dft-test.c
+++ b/celt/tests/dft-test.c
@@ -12,10 +12,10 @@
 #include "kiss_fft.h"
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
+#include "../celt/stack_alloc.h"
+#include "../celt/kiss_fft.c"
+#include "../celt/mathops.c"
+#include "../celt/entcode.c"
 
 
 #ifndef M_PI
diff --git a/libcelt/tests/ectest.c b/celt/tests/ectest.c
index 3abdfcdc..ee4fc5a0 100644
--- a/libcelt/tests/ectest.c
+++ b/celt/tests/ectest.c
@@ -11,9 +11,9 @@
 #include "entdec.h"
 #include <string.h>
 
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
 
 #ifndef M_LOG2E
 # define M_LOG2E    1.4426950408889634074
diff --git a/libcelt/tests/laplace-test.c b/celt/tests/laplace-test.c
index 222bc693..3c4cbd72 100644
--- a/libcelt/tests/laplace-test.c
+++ b/celt/tests/laplace-test.c
@@ -6,12 +6,12 @@
 #include <stdlib.h>
 #include "laplace.h"
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
+#include "../celt/stack_alloc.h"
 
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/laplace.c"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
+#include "../celt/laplace.c"
 
 #define DATA_SIZE 40000
 
diff --git a/libcelt/tests/mathops-test.c b/celt/tests/mathops-test.c
index b4eb3c0b..b4eb3c0b 100644
--- a/libcelt/tests/mathops-test.c
+++ b/celt/tests/mathops-test.c
diff --git a/libcelt/tests/mdct-test.c b/celt/tests/mdct-test.c
index 4f0733a8..67da13ad 100644
--- a/libcelt/tests/mdct-test.c
+++ b/celt/tests/mdct-test.c
@@ -11,12 +11,12 @@
 #include <stdio.h>
 #include "mdct.h"
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
+#include "../celt/stack_alloc.h"
 
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mdct.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
+#include "../celt/kiss_fft.c"
+#include "../celt/mdct.c"
+#include "../celt/mathops.c"
+#include "../celt/entcode.c"
 
 #ifndef M_PI
 #define M_PI 3.141592653
diff --git a/libcelt/tests/real-fft-test.c b/celt/tests/real-fft-test.c
index 3996b4ac..3f3f7b23 100644
--- a/libcelt/tests/real-fft-test.c
+++ b/celt/tests/real-fft-test.c
@@ -8,9 +8,9 @@
 #include <string.h>
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/kiss_fftr.c"
+#include "../celt/stack_alloc.h"
+#include "../celt/kiss_fft.c"
+#include "../celt/kiss_fftr.c"
 
 #ifdef FIXED_DEBUG
 long long celt_mips=0;
diff --git a/libcelt/tests/rotation-test.c b/celt/tests/rotation-test.c
index 05405684..05405684 100644
--- a/libcelt/tests/rotation-test.c
+++ b/celt/tests/rotation-test.c
diff --git a/libcelt/tests/type-test.c b/celt/tests/type-test.c
index 1c3357e9..1c3357e9 100644
--- a/libcelt/tests/type-test.c
+++ b/celt/tests/type-test.c
diff --git a/libcelt/vq.c b/celt/vq.c
index bf85f8d2..bf85f8d2 100644
--- a/libcelt/vq.c
+++ b/celt/vq.c
diff --git a/libcelt/vq.h b/celt/vq.h
index 4193ae5c..4193ae5c 100644
--- a/libcelt/vq.h
+++ b/celt/vq.h
diff --git a/celt_headers.txt b/celt_headers.txt
index 73e119db..26b7cfa6 100644
--- a/celt_headers.txt
+++ b/celt_headers.txt
@@ -1,30 +1,30 @@
 CELT_HEAD = \
-libcelt/arch.h \
-libcelt/bands.h \
-libcelt/celt.h \
-libcelt/opus_types.h \
-libcelt/opus_defines.h \
-libcelt/cwrs.h \
-libcelt/ecintrin.h \
-libcelt/entcode.h \
-libcelt/entdec.h \
-libcelt/entenc.h \
-libcelt/fixed_debug.h \
-libcelt/fixed_generic.h \
-libcelt/float_cast.h \
-libcelt/_kiss_fft_guts.h \
-libcelt/kiss_fft.h \
-libcelt/laplace.h \
-libcelt/mathops.h \
-libcelt/mdct.h \
-libcelt/mfrngcod.h \
-libcelt/modes.h \
-libcelt/os_support.h \
-libcelt/pitch.h \
-libcelt/plc.h \
-libcelt/quant_bands.h \
-libcelt/rate.h \
-libcelt/stack_alloc.h \
-libcelt/vq.h \
-libcelt/static_modes_float.h \
-libcelt/static_modes_fixed.h
+celt/arch.h \
+celt/bands.h \
+celt/celt.h \
+celt/opus_types.h \
+celt/opus_defines.h \
+celt/cwrs.h \
+celt/ecintrin.h \
+celt/entcode.h \
+celt/entdec.h \
+celt/entenc.h \
+celt/fixed_debug.h \
+celt/fixed_generic.h \
+celt/float_cast.h \
+celt/_kiss_fft_guts.h \
+celt/kiss_fft.h \
+celt/laplace.h \
+celt/mathops.h \
+celt/mdct.h \
+celt/mfrngcod.h \
+celt/modes.h \
+celt/os_support.h \
+celt/pitch.h \
+celt/plc.h \
+celt/quant_bands.h \
+celt/rate.h \
+celt/stack_alloc.h \
+celt/vq.h \
+celt/static_modes_float.h \
+celt/static_modes_fixed.h
diff --git a/celt_sources.mk b/celt_sources.mk
index b5721ae9..13c19214 100644
--- a/celt_sources.mk
+++ b/celt_sources.mk
@@ -1,16 +1,16 @@
-CELT_SOURCES = libcelt/bands.c \
-libcelt/celt.c \
-libcelt/cwrs.c \
-libcelt/entcode.c \
-libcelt/entdec.c \
-libcelt/entenc.c \
-libcelt/kiss_fft.c \
-libcelt/laplace.c \
-libcelt/mathops.c \
-libcelt/mdct.c \
-libcelt/modes.c \
-libcelt/pitch.c \
-libcelt/plc.c \
-libcelt/quant_bands.c \
-libcelt/rate.c \
-libcelt/vq.c
+CELT_SOURCES = celt/bands.c \
+celt/celt.c \
+celt/cwrs.c \
+celt/entcode.c \
+celt/entdec.c \
+celt/entenc.c \
+celt/kiss_fft.c \
+celt/laplace.c \
+celt/mathops.c \
+celt/mdct.c \
+celt/modes.c \
+celt/pitch.c \
+celt/plc.c \
+celt/quant_bands.c \
+celt/rate.c \
+celt/vq.c
diff --git a/configure.ac b/configure.ac
index ab46eaeb..d68c3727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ fi
 AM_CONDITIONAL([FIXED_POINT], [test x$ac_enable_fixed = xyes])
 AM_CONDITIONAL([CUSTOM_MODES], [test x$ac_enable_custom_modes = xyes])
 
-AC_OUTPUT([Makefile libcelt/tests/Makefile
+AC_OUTPUT([Makefile celt/tests/Makefile
            opus.pc opus-uninstalled.pc
            doc/Makefile doc/Doxyfile])
 
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 9ab8d582..108c7ba4 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -611,8 +611,8 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = @top_srcdir@/src/opus.h \
-			 @top_srcdir@/libcelt/opus_types.h   \
-                         @top_srcdir@/libcelt/opus_defines.h \
+			 @top_srcdir@/celt/opus_types.h   \
+                         @top_srcdir@/celt/opus_defines.h \
                          @top_srcdir@/src/opus_multistream.h
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3b135dd3..bd7eba3f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,8 @@
 
 DOCINPUTS = $(top_srcdir)/src/opus.h \
             $(top_srcdir)/src/opus_multistream.h \
-            $(top_srcdir)/libcelt/opus_defines.h \
-            $(top_srcdir)/libcelt/opus_types.h
+            $(top_srcdir)/celt/opus_defines.h \
+            $(top_srcdir)/celt/opus_types.h
 
 doc_DATA = doxygen-build.stamp
 
diff --git a/doc/build_draft.sh b/doc/build_draft.sh
index cbf14a42..105dbd05 100755
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -15,7 +15,7 @@ mkdir "${destdir}/src"
 mkdir "${destdir}/silk"
 mkdir "${destdir}/silk/float"
 mkdir "${destdir}/silk/fixed"
-mkdir "${destdir}/libcelt"
+mkdir "${destdir}/celt"
 for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
  "${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.txt \
  "${toplevel}"/celt_headers.txt "${toplevel}"/silk_headers.txt \
@@ -23,8 +23,8 @@ for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
   cp -a "${toplevel}/${f}" "${destdir}/${f}"
 done
 cp -a "${toplevel}"/src/test_opus.c "${destdir}"/src/
-cp -a "${toplevel}"/libcelt/test_opus_custom.c "${destdir}"/libcelt/
-cp -a "${toplevel}"/libcelt/opus_custom.h "${destdir}"/libcelt/
+cp -a "${toplevel}"/celt/test_opus_custom.c "${destdir}"/celt/
+cp -a "${toplevel}"/celt/opus_custom.h "${destdir}"/celt/
 cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile
 cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
 cp -a "${toplevel}"/celt_sources.mk "${destdir}"/
diff --git a/opus-uninstalled.pc.in b/opus-uninstalled.pc.in
index b6a86789..3f5d29fc 100644
--- a/opus-uninstalled.pc.in
+++ b/opus-uninstalled.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Requires:
 Conflicts:
 Libs: ${libdir}/libopus.a
-Cflags: -I${includedir}/src -I${includedir}/libcelt
+Cflags: -I${includedir}/src -I${includedir}/celt
diff --git a/opus.sln b/opus.sln
index c248b95f..6d2ea4e6 100644
--- a/opus.sln
+++ b/opus.sln
@@ -27,7 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_float", "silk\float\si
 		{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libcelt\libcelt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "celt", "celt\celt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 12b88f67..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-EXTRA_DIST = hybrid.vcxproj.filters  hybrid.vcxproj
-
-INCLUDES = -I$(top_srcdir)/celt/libcelt/ -I$(top_srcdir)/silk/interface 
-
-lib_LTLIBRARIES = libietfcodec.la
-libietfcodec_la_SOURCES = opus_decoder.c opus_encoder.c
-
-noinst_HEADERS = opus_decoder.h opus_encoder.h
-
-pkginclude_HEADERS = opus.h
-
-noinst_PROGRAMS = test_opus
-
-test_opus_SOURCES = test_opus.c
-test_opus_LDADD = libietfcodec.la $(top_builddir)/celt/libcelt/libcelt0.la $(top_builddir)/silk/libSKP_SILK_SDK.la
-