diff --git a/android/android.make b/android/android.make
index 5ec9a68ca8..c0d72a7a05 100644
--- a/android/android.make
+++ b/android/android.make
@@ -124,7 +124,7 @@ $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
 $(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
 	$(call PRINTS,CP rockbox.zip)cp $^ $@
 
-$(BINLIB_DIR)/lib%.so: $(BUILDDIR)/apps/codecs/%.codec
+$(BINLIB_DIR)/lib%.so: $(RBCODEC_BLD)/codecs/%.codec
 	$(call PRINTS,CP $(@F))cp $^ $@
 
 libs: $(DIRS) $(LIBS)
diff --git a/apps/codecs/lib/fixedpoint.c b/apps/codecs/lib/fixedpoint.c
deleted file mode 100644
index 352e246673..0000000000
--- a/apps/codecs/lib/fixedpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../fixedpoint.c"
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 27bc69f1ca..12344ae590 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -87,7 +87,7 @@ $(BUILDDIR)/credits.raw credits.raw: $(DOCSDIR)/CREDITS
 	$(call PRINTS,Create credits.raw)perl $(APPSDIR)/plugins/credits.pl < $< > $(BUILDDIR)/$(@F)
 
 # special dependencies
-$(BUILDDIR)/apps/plugins/wav2wv.rock: $(BUILDDIR)/apps/codecs/libwavpack.a $(PLUGIN_LIBS)
+$(BUILDDIR)/apps/plugins/wav2wv.rock: $(RBCODEC_BLD)/codecs/libwavpack.a $(PLUGIN_LIBS)
 
 # Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim
 ifeq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
diff --git a/firmware/target/hosted/ypr0/ypr0.make b/firmware/target/hosted/ypr0/ypr0.make
index d0f4cb7fe2..67ff326de0 100644
--- a/firmware/target/hosted/ypr0/ypr0.make
+++ b/firmware/target/hosted/ypr0/ypr0.make
@@ -16,7 +16,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
 	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
 		-L$(BUILDDIR)/firmware -lfirmware \
-		-L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+		-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
 		-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
 		$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 
diff --git a/apps/codecs/SOURCES b/lib/rbcodec/codecs/SOURCES
similarity index 100%
rename from apps/codecs/SOURCES
rename to lib/rbcodec/codecs/SOURCES
diff --git a/apps/codecs/a52.c b/lib/rbcodec/codecs/a52.c
similarity index 100%
rename from apps/codecs/a52.c
rename to lib/rbcodec/codecs/a52.c
diff --git a/apps/codecs/a52_rm.c b/lib/rbcodec/codecs/a52_rm.c
similarity index 99%
rename from apps/codecs/a52_rm.c
rename to lib/rbcodec/codecs/a52_rm.c
index 207c28272e..2db126f5b1 100644
--- a/apps/codecs/a52_rm.c
+++ b/lib/rbcodec/codecs/a52_rm.c
@@ -45,7 +45,7 @@ static void init_rm(RMContext *rmctx)
 /* used outside liba52 */
 static uint8_t buf[3840] IBSS_ATTR;
 
-/* The following two functions, a52_decode_data and output_audio are taken from apps/codecs/a52.c */
+/* The following two functions, a52_decode_data and output_audio are taken from a52.c */
 static inline void output_audio(sample_t *samples)
 {
     ci->yield();
diff --git a/apps/codecs/aac.c b/lib/rbcodec/codecs/aac.c
similarity index 100%
rename from apps/codecs/aac.c
rename to lib/rbcodec/codecs/aac.c
diff --git a/apps/codecs/adx.c b/lib/rbcodec/codecs/adx.c
similarity index 100%
rename from apps/codecs/adx.c
rename to lib/rbcodec/codecs/adx.c
diff --git a/apps/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c
similarity index 100%
rename from apps/codecs/aiff.c
rename to lib/rbcodec/codecs/aiff.c
diff --git a/apps/codecs/aiff_enc.c b/lib/rbcodec/codecs/aiff_enc.c
similarity index 100%
rename from apps/codecs/aiff_enc.c
rename to lib/rbcodec/codecs/aiff_enc.c
diff --git a/apps/codecs/alac.c b/lib/rbcodec/codecs/alac.c
similarity index 100%
rename from apps/codecs/alac.c
rename to lib/rbcodec/codecs/alac.c
diff --git a/apps/codecs/ape.c b/lib/rbcodec/codecs/ape.c
similarity index 100%
rename from apps/codecs/ape.c
rename to lib/rbcodec/codecs/ape.c
diff --git a/apps/codecs/asap.c b/lib/rbcodec/codecs/asap.c
similarity index 100%
rename from apps/codecs/asap.c
rename to lib/rbcodec/codecs/asap.c
diff --git a/apps/codecs/atrac3_oma.c b/lib/rbcodec/codecs/atrac3_oma.c
similarity index 100%
rename from apps/codecs/atrac3_oma.c
rename to lib/rbcodec/codecs/atrac3_oma.c
diff --git a/apps/codecs/atrac3_rm.c b/lib/rbcodec/codecs/atrac3_rm.c
similarity index 100%
rename from apps/codecs/atrac3_rm.c
rename to lib/rbcodec/codecs/atrac3_rm.c
diff --git a/apps/codecs/au.c b/lib/rbcodec/codecs/au.c
similarity index 100%
rename from apps/codecs/au.c
rename to lib/rbcodec/codecs/au.c
diff --git a/apps/codecs/ay.c b/lib/rbcodec/codecs/ay.c
similarity index 100%
rename from apps/codecs/ay.c
rename to lib/rbcodec/codecs/ay.c
diff --git a/apps/codecs/codec_crt0.c b/lib/rbcodec/codecs/codec_crt0.c
similarity index 100%
rename from apps/codecs/codec_crt0.c
rename to lib/rbcodec/codecs/codec_crt0.c
diff --git a/apps/codecs.h b/lib/rbcodec/codecs/codecs.h
similarity index 99%
rename from apps/codecs.h
rename to lib/rbcodec/codecs/codecs.h
index 1334953b82..bad8cdd469 100644
--- a/apps/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -22,7 +22,7 @@
 #define _CODECS_H_
 
 /* instruct simulator code to not redefine any symbols when compiling codecs.
-   (the CODEC macro is defined in apps/codecs/Makefile) */
+   (the CODEC macro is defined in codecs.make) */
 #ifdef CODEC
 #define NO_REDEFINES_PLEASE
 #endif
diff --git a/apps/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
similarity index 74%
rename from apps/codecs/codecs.make
rename to lib/rbcodec/codecs/codecs.make
index eac3089260..919aef2024 100644
--- a/apps/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -7,54 +7,54 @@
 # $Id$
 #
 
-CODECDIR = $(BUILDDIR)/apps/codecs
-CODECS_SRC := $(call preprocess, $(APPSDIR)/codecs/SOURCES)
+CODECDIR = $(RBCODEC_BLD)/codecs
+CODECS_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/SOURCES)
 OTHER_SRC += $(CODECS_SRC)
 
 CODECS := $(CODECS_SRC:.c=.codec)
-CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS))
+CODECS := $(subst $(RBCODECLIB_DIR),$(RBCODEC_BLD),$(CODECS))
 
 # the codec helper library
-include $(APPSDIR)/codecs/lib/libcodec.make
-OTHER_INC += -I$(APPSDIR)/codecs/lib
+include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
+OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
 
 # extra libraries
 CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB)
 
 # the codec libraries
-include $(APPSDIR)/codecs/demac/libdemac.make
-include $(APPSDIR)/codecs/liba52/liba52.make
-include $(APPSDIR)/codecs/libalac/libalac.make
-include $(APPSDIR)/codecs/libasap/libasap.make
-include $(APPSDIR)/codecs/libasf/libasf.make
-include $(APPSDIR)/codecs/libfaad/libfaad.make
-include $(APPSDIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
-include $(APPSDIR)/codecs/libm4a/libm4a.make
-include $(APPSDIR)/codecs/libmad/libmad.make
-include $(APPSDIR)/codecs/libmusepack/libmusepack.make
-include $(APPSDIR)/codecs/libspc/libspc.make
-include $(APPSDIR)/codecs/libspeex/libspeex.make
-include $(APPSDIR)/codecs/libtremor/libtremor.make
-include $(APPSDIR)/codecs/libwavpack/libwavpack.make
-include $(APPSDIR)/codecs/libwma/libwma.make
-include $(APPSDIR)/codecs/libwmapro/libwmapro.make
-include $(APPSDIR)/codecs/libcook/libcook.make
-include $(APPSDIR)/codecs/librm/librm.make
-include $(APPSDIR)/codecs/libatrac/libatrac.make
-include $(APPSDIR)/codecs/libpcm/libpcm.make
-include $(APPSDIR)/codecs/libtta/libtta.make
-include $(APPSDIR)/codecs/libgme/libay.make
-include $(APPSDIR)/codecs/libgme/libgbs.make
-include $(APPSDIR)/codecs/libgme/libhes.make
-include $(APPSDIR)/codecs/libgme/libnsf.make
-include $(APPSDIR)/codecs/libgme/libsgc.make
-include $(APPSDIR)/codecs/libgme/libvgm.make
-include $(APPSDIR)/codecs/libgme/libkss.make
-include $(APPSDIR)/codecs/libgme/libemu2413.make
+include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
+include $(RBCODECLIB_DIR)/codecs/liba52/liba52.make
+include $(RBCODECLIB_DIR)/codecs/libalac/libalac.make
+include $(RBCODECLIB_DIR)/codecs/libasap/libasap.make
+include $(RBCODECLIB_DIR)/codecs/libasf/libasf.make
+include $(RBCODECLIB_DIR)/codecs/libfaad/libfaad.make
+include $(RBCODECLIB_DIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
+include $(RBCODECLIB_DIR)/codecs/libm4a/libm4a.make
+include $(RBCODECLIB_DIR)/codecs/libmad/libmad.make
+include $(RBCODECLIB_DIR)/codecs/libmusepack/libmusepack.make
+include $(RBCODECLIB_DIR)/codecs/libspc/libspc.make
+include $(RBCODECLIB_DIR)/codecs/libspeex/libspeex.make
+include $(RBCODECLIB_DIR)/codecs/libtremor/libtremor.make
+include $(RBCODECLIB_DIR)/codecs/libwavpack/libwavpack.make
+include $(RBCODECLIB_DIR)/codecs/libwma/libwma.make
+include $(RBCODECLIB_DIR)/codecs/libwmapro/libwmapro.make
+include $(RBCODECLIB_DIR)/codecs/libcook/libcook.make
+include $(RBCODECLIB_DIR)/codecs/librm/librm.make
+include $(RBCODECLIB_DIR)/codecs/libatrac/libatrac.make
+include $(RBCODECLIB_DIR)/codecs/libpcm/libpcm.make
+include $(RBCODECLIB_DIR)/codecs/libtta/libtta.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libay.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libgbs.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libhes.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libnsf.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libsgc.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libvgm.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libkss.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libemu2413.make
 
 # compile flags for codecs
-CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
-	-I$(APPSDIR)/codecs/lib -DCODEC
+CODECFLAGS = $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \
+			 -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC
 
 # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last
 # in a -ffoo -fno-foo pair, there is no need to filter them out
@@ -172,13 +172,13 @@ $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
 $(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECFLAGS) -c $< -o $@
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/cook.c b/lib/rbcodec/codecs/cook.c
similarity index 100%
rename from apps/codecs/cook.c
rename to lib/rbcodec/codecs/cook.c
diff --git a/apps/codecs/demac/COPYING b/lib/rbcodec/codecs/demac/COPYING
similarity index 100%
rename from apps/codecs/demac/COPYING
rename to lib/rbcodec/codecs/demac/COPYING
diff --git a/apps/codecs/demac/Makefile b/lib/rbcodec/codecs/demac/Makefile
similarity index 100%
rename from apps/codecs/demac/Makefile
rename to lib/rbcodec/codecs/demac/Makefile
diff --git a/apps/codecs/demac/README b/lib/rbcodec/codecs/demac/README
similarity index 89%
rename from apps/codecs/demac/README
rename to lib/rbcodec/codecs/demac/README
index 2fcdd95edf..73a1c22485 100644
--- a/apps/codecs/demac/README
+++ b/lib/rbcodec/codecs/demac/README
@@ -41,14 +41,14 @@ demac/libdemac/*.[ch] - The main libdemac code
 Latest Version
 
 The latest version of demac and libdemac can always be found in the
-"apps/codecs/demac/" directory in the Rockbox source.  You can check
+"lib/rbcodec/codecs/demac/" directory in the Rockbox source.  You can check
 this out from svn with the command:
 
-svn co svn://svn.rockbox.org/rockbox/trunk/apps/codecs/demac demac
+svn co svn://svn.rockbox.org/rockbox/trunk/lib/rbcodec/codecs/demac demac
 
 Or browse the source code online here:
 
-http://svn.rockbox.org/viewvc.cgi/trunk/apps/codecs/demac
+http://svn.rockbox.org/viewvc.cgi/trunk/lib/rbcodec/codecs/demac
 
 
 
diff --git a/apps/codecs/demac/demac.c b/lib/rbcodec/codecs/demac/demac.c
similarity index 100%
rename from apps/codecs/demac/demac.c
rename to lib/rbcodec/codecs/demac/demac.c
diff --git a/apps/codecs/demac/libdemac.make b/lib/rbcodec/codecs/demac/libdemac.make
similarity index 88%
rename from apps/codecs/demac/libdemac.make
rename to lib/rbcodec/codecs/demac/libdemac.make
index 62ad53dfcc..6f64b2ff10 100644
--- a/apps/codecs/demac/libdemac.make
+++ b/lib/rbcodec/codecs/demac/libdemac.make
@@ -9,11 +9,11 @@
 
 # libdemac
 DEMACLIB := $(CODECDIR)/libdemac.a
-DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES)
+DEMACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/demac/libdemac/SOURCES)
 DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
 OTHER_SRC += $(DEMACLIB_SRC)
 ifeq ($(ARCH),arch_arm)
-OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S
+OTHER_SRC += $(RBCODECLIB_DIR)/codecs/demac/libdemac/udiv32_arm-pre.S
 endif
 DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB))
 DEMACLIB_OBJ_PRE := $(subst udiv32_arm.o,udiv32_arm-pre.o,$(DEMACLIB_OBJ))
diff --git a/apps/codecs/demac/libdemac/SOURCES b/lib/rbcodec/codecs/demac/libdemac/SOURCES
similarity index 100%
rename from apps/codecs/demac/libdemac/SOURCES
rename to lib/rbcodec/codecs/demac/libdemac/SOURCES
diff --git a/apps/codecs/demac/libdemac/crc.c b/lib/rbcodec/codecs/demac/libdemac/crc.c
similarity index 100%
rename from apps/codecs/demac/libdemac/crc.c
rename to lib/rbcodec/codecs/demac/libdemac/crc.c
diff --git a/apps/codecs/demac/libdemac/decoder.c b/lib/rbcodec/codecs/demac/libdemac/decoder.c
similarity index 100%
rename from apps/codecs/demac/libdemac/decoder.c
rename to lib/rbcodec/codecs/demac/libdemac/decoder.c
diff --git a/apps/codecs/demac/libdemac/decoder.h b/lib/rbcodec/codecs/demac/libdemac/decoder.h
similarity index 100%
rename from apps/codecs/demac/libdemac/decoder.h
rename to lib/rbcodec/codecs/demac/libdemac/decoder.h
diff --git a/apps/codecs/demac/libdemac/demac.h b/lib/rbcodec/codecs/demac/libdemac/demac.h
similarity index 100%
rename from apps/codecs/demac/libdemac/demac.h
rename to lib/rbcodec/codecs/demac/libdemac/demac.h
diff --git a/apps/codecs/demac/libdemac/demac_config.h b/lib/rbcodec/codecs/demac/libdemac/demac_config.h
similarity index 100%
rename from apps/codecs/demac/libdemac/demac_config.h
rename to lib/rbcodec/codecs/demac/libdemac/demac_config.h
diff --git a/apps/codecs/demac/libdemac/entropy.c b/lib/rbcodec/codecs/demac/libdemac/entropy.c
similarity index 100%
rename from apps/codecs/demac/libdemac/entropy.c
rename to lib/rbcodec/codecs/demac/libdemac/entropy.c
diff --git a/apps/codecs/demac/libdemac/entropy.h b/lib/rbcodec/codecs/demac/libdemac/entropy.h
similarity index 100%
rename from apps/codecs/demac/libdemac/entropy.h
rename to lib/rbcodec/codecs/demac/libdemac/entropy.h
diff --git a/apps/codecs/demac/libdemac/filter.c b/lib/rbcodec/codecs/demac/libdemac/filter.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter.c
rename to lib/rbcodec/codecs/demac/libdemac/filter.c
diff --git a/apps/codecs/demac/libdemac/filter.h b/lib/rbcodec/codecs/demac/libdemac/filter.h
similarity index 100%
rename from apps/codecs/demac/libdemac/filter.h
rename to lib/rbcodec/codecs/demac/libdemac/filter.h
diff --git a/apps/codecs/demac/libdemac/filter_1280_15.c b/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter_1280_15.c
rename to lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
diff --git a/apps/codecs/demac/libdemac/filter_16_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter_16_11.c
rename to lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
diff --git a/apps/codecs/demac/libdemac/filter_256_13.c b/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter_256_13.c
rename to lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
diff --git a/apps/codecs/demac/libdemac/filter_32_10.c b/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter_32_10.c
rename to lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
diff --git a/apps/codecs/demac/libdemac/filter_64_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
similarity index 100%
rename from apps/codecs/demac/libdemac/filter_64_11.c
rename to lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
diff --git a/apps/codecs/demac/libdemac/parser.c b/lib/rbcodec/codecs/demac/libdemac/parser.c
similarity index 100%
rename from apps/codecs/demac/libdemac/parser.c
rename to lib/rbcodec/codecs/demac/libdemac/parser.c
diff --git a/apps/codecs/demac/libdemac/parser.h b/lib/rbcodec/codecs/demac/libdemac/parser.h
similarity index 100%
rename from apps/codecs/demac/libdemac/parser.h
rename to lib/rbcodec/codecs/demac/libdemac/parser.h
diff --git a/apps/codecs/demac/libdemac/predictor-arm.S b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
similarity index 100%
rename from apps/codecs/demac/libdemac/predictor-arm.S
rename to lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
diff --git a/apps/codecs/demac/libdemac/predictor-cf.S b/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
similarity index 100%
rename from apps/codecs/demac/libdemac/predictor-cf.S
rename to lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
diff --git a/apps/codecs/demac/libdemac/predictor.c b/lib/rbcodec/codecs/demac/libdemac/predictor.c
similarity index 100%
rename from apps/codecs/demac/libdemac/predictor.c
rename to lib/rbcodec/codecs/demac/libdemac/predictor.c
diff --git a/apps/codecs/demac/libdemac/predictor.h b/lib/rbcodec/codecs/demac/libdemac/predictor.h
similarity index 100%
rename from apps/codecs/demac/libdemac/predictor.h
rename to lib/rbcodec/codecs/demac/libdemac/predictor.h
diff --git a/apps/codecs/demac/libdemac/udiv32_arm-pre.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
similarity index 100%
rename from apps/codecs/demac/libdemac/udiv32_arm-pre.S
rename to lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
diff --git a/apps/codecs/demac/libdemac/udiv32_arm.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
similarity index 99%
rename from apps/codecs/demac/libdemac/udiv32_arm.S
rename to lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
index 10c0731db1..7b851659bd 100644
--- a/apps/codecs/demac/libdemac/udiv32_arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
@@ -33,7 +33,7 @@
    link of the APE codec, stating the amount of IRAM remaining for use by the
    reciprocal lookup table. */
 #if !defined(APE_PRE) && defined(USE_IRAM) && ARM_ARCH < 5
-#include "apps/codecs/ape_free_iram.h"
+#include "lib/rbcodec/codecs/ape_free_iram.h"
 #endif
 
 /* Codecs should not normally do this, but we need to check a macro, and
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv5te.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math16_armv5te.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv6.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math16_armv6.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv7.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math16_armv7.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_cf.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math16_cf.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_mmx.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math16_mmx.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
diff --git a/apps/codecs/demac/libdemac/vector_math32_armv4.h b/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math32_armv4.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
diff --git a/apps/codecs/demac/libdemac/vector_math_generic.h b/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
similarity index 100%
rename from apps/codecs/demac/libdemac/vector_math_generic.h
rename to lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
diff --git a/apps/codecs/demac/wavwrite.c b/lib/rbcodec/codecs/demac/wavwrite.c
similarity index 100%
rename from apps/codecs/demac/wavwrite.c
rename to lib/rbcodec/codecs/demac/wavwrite.c
diff --git a/apps/codecs/demac/wavwrite.h b/lib/rbcodec/codecs/demac/wavwrite.h
similarity index 100%
rename from apps/codecs/demac/wavwrite.h
rename to lib/rbcodec/codecs/demac/wavwrite.h
diff --git a/apps/codecs/flac.c b/lib/rbcodec/codecs/flac.c
similarity index 100%
rename from apps/codecs/flac.c
rename to lib/rbcodec/codecs/flac.c
diff --git a/apps/codecs/gbs.c b/lib/rbcodec/codecs/gbs.c
similarity index 100%
rename from apps/codecs/gbs.c
rename to lib/rbcodec/codecs/gbs.c
diff --git a/apps/codecs/hes.c b/lib/rbcodec/codecs/hes.c
similarity index 100%
rename from apps/codecs/hes.c
rename to lib/rbcodec/codecs/hes.c
diff --git a/apps/codecs/kss.c b/lib/rbcodec/codecs/kss.c
similarity index 100%
rename from apps/codecs/kss.c
rename to lib/rbcodec/codecs/kss.c
diff --git a/apps/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
similarity index 100%
rename from apps/codecs/lib/SOURCES
rename to lib/rbcodec/codecs/lib/SOURCES
diff --git a/apps/codecs/lib/asm_arm.h b/lib/rbcodec/codecs/lib/asm_arm.h
similarity index 100%
rename from apps/codecs/lib/asm_arm.h
rename to lib/rbcodec/codecs/lib/asm_arm.h
diff --git a/apps/codecs/lib/asm_mcf5249.h b/lib/rbcodec/codecs/lib/asm_mcf5249.h
similarity index 100%
rename from apps/codecs/lib/asm_mcf5249.h
rename to lib/rbcodec/codecs/lib/asm_mcf5249.h
diff --git a/apps/codecs/lib/codeclib.c b/lib/rbcodec/codecs/lib/codeclib.c
similarity index 100%
rename from apps/codecs/lib/codeclib.c
rename to lib/rbcodec/codecs/lib/codeclib.c
diff --git a/apps/codecs/lib/codeclib.h b/lib/rbcodec/codecs/lib/codeclib.h
similarity index 100%
rename from apps/codecs/lib/codeclib.h
rename to lib/rbcodec/codecs/lib/codeclib.h
diff --git a/apps/codecs/lib/codeclib_misc.h b/lib/rbcodec/codecs/lib/codeclib_misc.h
similarity index 100%
rename from apps/codecs/lib/codeclib_misc.h
rename to lib/rbcodec/codecs/lib/codeclib_misc.h
diff --git a/apps/codecs/lib/ffmpeg_bitstream.c b/lib/rbcodec/codecs/lib/ffmpeg_bitstream.c
similarity index 100%
rename from apps/codecs/lib/ffmpeg_bitstream.c
rename to lib/rbcodec/codecs/lib/ffmpeg_bitstream.c
diff --git a/apps/codecs/lib/ffmpeg_bswap.h b/lib/rbcodec/codecs/lib/ffmpeg_bswap.h
similarity index 100%
rename from apps/codecs/lib/ffmpeg_bswap.h
rename to lib/rbcodec/codecs/lib/ffmpeg_bswap.h
diff --git a/apps/codecs/lib/ffmpeg_get_bits.h b/lib/rbcodec/codecs/lib/ffmpeg_get_bits.h
similarity index 100%
rename from apps/codecs/lib/ffmpeg_get_bits.h
rename to lib/rbcodec/codecs/lib/ffmpeg_get_bits.h
diff --git a/apps/codecs/lib/ffmpeg_intreadwrite.h b/lib/rbcodec/codecs/lib/ffmpeg_intreadwrite.h
similarity index 100%
rename from apps/codecs/lib/ffmpeg_intreadwrite.h
rename to lib/rbcodec/codecs/lib/ffmpeg_intreadwrite.h
diff --git a/apps/codecs/lib/ffmpeg_put_bits.h b/lib/rbcodec/codecs/lib/ffmpeg_put_bits.h
similarity index 100%
rename from apps/codecs/lib/ffmpeg_put_bits.h
rename to lib/rbcodec/codecs/lib/ffmpeg_put_bits.h
diff --git a/apps/codecs/lib/fft-ffmpeg.c b/lib/rbcodec/codecs/lib/fft-ffmpeg.c
similarity index 100%
rename from apps/codecs/lib/fft-ffmpeg.c
rename to lib/rbcodec/codecs/lib/fft-ffmpeg.c
diff --git a/apps/codecs/lib/fft-ffmpeg_arm.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
similarity index 100%
rename from apps/codecs/lib/fft-ffmpeg_arm.h
rename to lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
diff --git a/apps/codecs/lib/fft-ffmpeg_cf.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
similarity index 100%
rename from apps/codecs/lib/fft-ffmpeg_cf.h
rename to lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
diff --git a/apps/codecs/lib/fft.h b/lib/rbcodec/codecs/lib/fft.h
similarity index 100%
rename from apps/codecs/lib/fft.h
rename to lib/rbcodec/codecs/lib/fft.h
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.c b/lib/rbcodec/codecs/lib/fixedpoint.c
new file mode 100644
index 0000000000..a66dcb1270
--- /dev/null
+++ b/lib/rbcodec/codecs/lib/fixedpoint.c
@@ -0,0 +1 @@
+#include "../../../apps/fixedpoint.c"
diff --git a/apps/codecs/lib/fixedpoint.h b/lib/rbcodec/codecs/lib/fixedpoint.h
similarity index 100%
rename from apps/codecs/lib/fixedpoint.h
rename to lib/rbcodec/codecs/lib/fixedpoint.h
diff --git a/apps/codecs/lib/libcodec.make b/lib/rbcodec/codecs/lib/libcodec.make
similarity index 89%
rename from apps/codecs/lib/libcodec.make
rename to lib/rbcodec/codecs/lib/libcodec.make
index 7aef72f2b1..4931d36b74 100644
--- a/apps/codecs/lib/libcodec.make
+++ b/lib/rbcodec/codecs/lib/libcodec.make
@@ -8,7 +8,7 @@
 #
 
 CODECLIB := $(CODECDIR)/libcodec.a
-CODECLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/lib/SOURCES)
+CODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/lib/SOURCES)
 CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC))
 OTHER_SRC += $(CODECLIB_SRC)
 
@@ -31,7 +31,7 @@ ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
     CODECLIBFLAGS += -ffunction-sections
 endif
 
-$(CODECDIR)/lib/%.o: $(ROOTDIR)/apps/codecs/lib/%.c
+$(CODECDIR)/lib/%.o: $(RBCODECLIB_DIR)/codecs/lib/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECLIBFLAGS) -c $< -o $@
diff --git a/apps/codecs/lib/mdct.c b/lib/rbcodec/codecs/lib/mdct.c
similarity index 100%
rename from apps/codecs/lib/mdct.c
rename to lib/rbcodec/codecs/lib/mdct.c
diff --git a/apps/codecs/lib/mdct.h b/lib/rbcodec/codecs/lib/mdct.h
similarity index 100%
rename from apps/codecs/lib/mdct.h
rename to lib/rbcodec/codecs/lib/mdct.h
diff --git a/apps/codecs/lib/mdct_lookup.c b/lib/rbcodec/codecs/lib/mdct_lookup.c
similarity index 100%
rename from apps/codecs/lib/mdct_lookup.c
rename to lib/rbcodec/codecs/lib/mdct_lookup.c
diff --git a/apps/codecs/lib/mdct_lookup.h b/lib/rbcodec/codecs/lib/mdct_lookup.h
similarity index 100%
rename from apps/codecs/lib/mdct_lookup.h
rename to lib/rbcodec/codecs/lib/mdct_lookup.h
diff --git a/apps/codecs/lib/osx.dummy.c b/lib/rbcodec/codecs/lib/osx.dummy.c
similarity index 100%
rename from apps/codecs/lib/osx.dummy.c
rename to lib/rbcodec/codecs/lib/osx.dummy.c
diff --git a/apps/codecs/liba52/AUTHORS b/lib/rbcodec/codecs/liba52/AUTHORS
similarity index 100%
rename from apps/codecs/liba52/AUTHORS
rename to lib/rbcodec/codecs/liba52/AUTHORS
diff --git a/apps/codecs/liba52/COPYING b/lib/rbcodec/codecs/liba52/COPYING
similarity index 100%
rename from apps/codecs/liba52/COPYING
rename to lib/rbcodec/codecs/liba52/COPYING
diff --git a/apps/codecs/liba52/ChangeLog b/lib/rbcodec/codecs/liba52/ChangeLog
similarity index 100%
rename from apps/codecs/liba52/ChangeLog
rename to lib/rbcodec/codecs/liba52/ChangeLog
diff --git a/apps/codecs/liba52/HISTORY b/lib/rbcodec/codecs/liba52/HISTORY
similarity index 100%
rename from apps/codecs/liba52/HISTORY
rename to lib/rbcodec/codecs/liba52/HISTORY
diff --git a/apps/codecs/liba52/INSTALL b/lib/rbcodec/codecs/liba52/INSTALL
similarity index 100%
rename from apps/codecs/liba52/INSTALL
rename to lib/rbcodec/codecs/liba52/INSTALL
diff --git a/apps/codecs/liba52/NEWS b/lib/rbcodec/codecs/liba52/NEWS
similarity index 100%
rename from apps/codecs/liba52/NEWS
rename to lib/rbcodec/codecs/liba52/NEWS
diff --git a/apps/codecs/liba52/README b/lib/rbcodec/codecs/liba52/README
similarity index 100%
rename from apps/codecs/liba52/README
rename to lib/rbcodec/codecs/liba52/README
diff --git a/apps/codecs/liba52/README.rockbox b/lib/rbcodec/codecs/liba52/README.rockbox
similarity index 100%
rename from apps/codecs/liba52/README.rockbox
rename to lib/rbcodec/codecs/liba52/README.rockbox
diff --git a/apps/codecs/liba52/SOURCES b/lib/rbcodec/codecs/liba52/SOURCES
similarity index 100%
rename from apps/codecs/liba52/SOURCES
rename to lib/rbcodec/codecs/liba52/SOURCES
diff --git a/apps/codecs/liba52/TODO b/lib/rbcodec/codecs/liba52/TODO
similarity index 100%
rename from apps/codecs/liba52/TODO
rename to lib/rbcodec/codecs/liba52/TODO
diff --git a/apps/codecs/liba52/a52.h b/lib/rbcodec/codecs/liba52/a52.h
similarity index 100%
rename from apps/codecs/liba52/a52.h
rename to lib/rbcodec/codecs/liba52/a52.h
diff --git a/apps/codecs/liba52/a52_internal.h b/lib/rbcodec/codecs/liba52/a52_internal.h
similarity index 100%
rename from apps/codecs/liba52/a52_internal.h
rename to lib/rbcodec/codecs/liba52/a52_internal.h
diff --git a/apps/codecs/liba52/attributes.h b/lib/rbcodec/codecs/liba52/attributes.h
similarity index 100%
rename from apps/codecs/liba52/attributes.h
rename to lib/rbcodec/codecs/liba52/attributes.h
diff --git a/apps/codecs/liba52/bit_allocate.c b/lib/rbcodec/codecs/liba52/bit_allocate.c
similarity index 100%
rename from apps/codecs/liba52/bit_allocate.c
rename to lib/rbcodec/codecs/liba52/bit_allocate.c
diff --git a/apps/codecs/liba52/bitstream.c b/lib/rbcodec/codecs/liba52/bitstream.c
similarity index 100%
rename from apps/codecs/liba52/bitstream.c
rename to lib/rbcodec/codecs/liba52/bitstream.c
diff --git a/apps/codecs/liba52/bitstream.h b/lib/rbcodec/codecs/liba52/bitstream.h
similarity index 100%
rename from apps/codecs/liba52/bitstream.h
rename to lib/rbcodec/codecs/liba52/bitstream.h
diff --git a/apps/codecs/liba52/config-a52.h b/lib/rbcodec/codecs/liba52/config-a52.h
similarity index 100%
rename from apps/codecs/liba52/config-a52.h
rename to lib/rbcodec/codecs/liba52/config-a52.h
diff --git a/apps/codecs/liba52/downmix.c b/lib/rbcodec/codecs/liba52/downmix.c
similarity index 100%
rename from apps/codecs/liba52/downmix.c
rename to lib/rbcodec/codecs/liba52/downmix.c
diff --git a/apps/codecs/liba52/imdct.c b/lib/rbcodec/codecs/liba52/imdct.c
similarity index 100%
rename from apps/codecs/liba52/imdct.c
rename to lib/rbcodec/codecs/liba52/imdct.c
diff --git a/apps/codecs/liba52/imdct_lookups.h b/lib/rbcodec/codecs/liba52/imdct_lookups.h
similarity index 100%
rename from apps/codecs/liba52/imdct_lookups.h
rename to lib/rbcodec/codecs/liba52/imdct_lookups.h
diff --git a/apps/codecs/liba52/liba52.make b/lib/rbcodec/codecs/liba52/liba52.make
similarity index 89%
rename from apps/codecs/liba52/liba52.make
rename to lib/rbcodec/codecs/liba52/liba52.make
index 79b2eb222e..04cae4f080 100644
--- a/apps/codecs/liba52/liba52.make
+++ b/lib/rbcodec/codecs/liba52/liba52.make
@@ -9,7 +9,7 @@
 
 # liba52
 A52LIB := $(CODECDIR)/liba52.a
-A52LIB_SRC := $(call preprocess, $(APPSDIR)/codecs/liba52/SOURCES)
+A52LIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/liba52/SOURCES)
 A52LIB_OBJ := $(call c2obj, $(A52LIB_SRC))
 OTHER_SRC += $(A52LIB_SRC)
 
diff --git a/apps/codecs/liba52/mm_accel.h b/lib/rbcodec/codecs/liba52/mm_accel.h
similarity index 100%
rename from apps/codecs/liba52/mm_accel.h
rename to lib/rbcodec/codecs/liba52/mm_accel.h
diff --git a/apps/codecs/liba52/parse.c b/lib/rbcodec/codecs/liba52/parse.c
similarity index 100%
rename from apps/codecs/liba52/parse.c
rename to lib/rbcodec/codecs/liba52/parse.c
diff --git a/apps/codecs/liba52/tables.h b/lib/rbcodec/codecs/liba52/tables.h
similarity index 100%
rename from apps/codecs/liba52/tables.h
rename to lib/rbcodec/codecs/liba52/tables.h
diff --git a/apps/codecs/liba52/tendra.h b/lib/rbcodec/codecs/liba52/tendra.h
similarity index 100%
rename from apps/codecs/liba52/tendra.h
rename to lib/rbcodec/codecs/liba52/tendra.h
diff --git a/apps/codecs/libalac/README b/lib/rbcodec/codecs/libalac/README
similarity index 100%
rename from apps/codecs/libalac/README
rename to lib/rbcodec/codecs/libalac/README
diff --git a/apps/codecs/libalac/README.rockbox b/lib/rbcodec/codecs/libalac/README.rockbox
similarity index 100%
rename from apps/codecs/libalac/README.rockbox
rename to lib/rbcodec/codecs/libalac/README.rockbox
diff --git a/apps/codecs/libalac/SOURCES b/lib/rbcodec/codecs/libalac/SOURCES
similarity index 100%
rename from apps/codecs/libalac/SOURCES
rename to lib/rbcodec/codecs/libalac/SOURCES
diff --git a/apps/codecs/libalac/alac.c b/lib/rbcodec/codecs/libalac/alac.c
similarity index 100%
rename from apps/codecs/libalac/alac.c
rename to lib/rbcodec/codecs/libalac/alac.c
diff --git a/apps/codecs/libalac/decomp.h b/lib/rbcodec/codecs/libalac/decomp.h
similarity index 100%
rename from apps/codecs/libalac/decomp.h
rename to lib/rbcodec/codecs/libalac/decomp.h
diff --git a/apps/codecs/libalac/libalac.make b/lib/rbcodec/codecs/libalac/libalac.make
similarity index 88%
rename from apps/codecs/libalac/libalac.make
rename to lib/rbcodec/codecs/libalac/libalac.make
index a0300554c3..8b8a842f8e 100644
--- a/apps/codecs/libalac/libalac.make
+++ b/lib/rbcodec/codecs/libalac/libalac.make
@@ -9,7 +9,7 @@
 
 # libalac
 ALACLIB := $(CODECDIR)/libalac.a
-ALACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libalac/SOURCES)
+ALACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libalac/SOURCES)
 ALACLIB_OBJ := $(call c2obj, $(ALACLIB_SRC))
 OTHER_SRC += $(ALACLIB_SRC)
 
diff --git a/apps/codecs/libasap/CREDITS b/lib/rbcodec/codecs/libasap/CREDITS
similarity index 100%
rename from apps/codecs/libasap/CREDITS
rename to lib/rbcodec/codecs/libasap/CREDITS
diff --git a/apps/codecs/libasap/README b/lib/rbcodec/codecs/libasap/README
similarity index 100%
rename from apps/codecs/libasap/README
rename to lib/rbcodec/codecs/libasap/README
diff --git a/apps/codecs/libasap/README.rockbox b/lib/rbcodec/codecs/libasap/README.rockbox
similarity index 100%
rename from apps/codecs/libasap/README.rockbox
rename to lib/rbcodec/codecs/libasap/README.rockbox
diff --git a/apps/codecs/libasap/SOURCES b/lib/rbcodec/codecs/libasap/SOURCES
similarity index 100%
rename from apps/codecs/libasap/SOURCES
rename to lib/rbcodec/codecs/libasap/SOURCES
diff --git a/apps/codecs/libasap/acpu.c b/lib/rbcodec/codecs/libasap/acpu.c
similarity index 100%
rename from apps/codecs/libasap/acpu.c
rename to lib/rbcodec/codecs/libasap/acpu.c
diff --git a/apps/codecs/libasap/anylang.h b/lib/rbcodec/codecs/libasap/anylang.h
similarity index 100%
rename from apps/codecs/libasap/anylang.h
rename to lib/rbcodec/codecs/libasap/anylang.h
diff --git a/apps/codecs/libasap/apokeysnd.c b/lib/rbcodec/codecs/libasap/apokeysnd.c
similarity index 100%
rename from apps/codecs/libasap/apokeysnd.c
rename to lib/rbcodec/codecs/libasap/apokeysnd.c
diff --git a/apps/codecs/libasap/asap.c b/lib/rbcodec/codecs/libasap/asap.c
similarity index 100%
rename from apps/codecs/libasap/asap.c
rename to lib/rbcodec/codecs/libasap/asap.c
diff --git a/apps/codecs/libasap/asap.h b/lib/rbcodec/codecs/libasap/asap.h
similarity index 100%
rename from apps/codecs/libasap/asap.h
rename to lib/rbcodec/codecs/libasap/asap.h
diff --git a/apps/codecs/libasap/asap_internal.h b/lib/rbcodec/codecs/libasap/asap_internal.h
similarity index 100%
rename from apps/codecs/libasap/asap_internal.h
rename to lib/rbcodec/codecs/libasap/asap_internal.h
diff --git a/apps/codecs/libasap/libasap.make b/lib/rbcodec/codecs/libasap/libasap.make
similarity index 88%
rename from apps/codecs/libasap/libasap.make
rename to lib/rbcodec/codecs/libasap/libasap.make
index d904c14257..cbf461d4fb 100644
--- a/apps/codecs/libasap/libasap.make
+++ b/lib/rbcodec/codecs/libasap/libasap.make
@@ -9,7 +9,7 @@
 
 # libasap
 ASAPLIB := $(CODECDIR)/libasap.a
-ASAPLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libasap/SOURCES)
+ASAPLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libasap/SOURCES)
 ASAPLIB_OBJ := $(call c2obj, $(ASAPLIB_SRC))
 OTHER_SRC += $(ASAPLIB_SRC)
 
diff --git a/apps/codecs/libasap/players.h b/lib/rbcodec/codecs/libasap/players.h
similarity index 100%
rename from apps/codecs/libasap/players.h
rename to lib/rbcodec/codecs/libasap/players.h
diff --git a/apps/codecs/libasf/SOURCES b/lib/rbcodec/codecs/libasf/SOURCES
similarity index 100%
rename from apps/codecs/libasf/SOURCES
rename to lib/rbcodec/codecs/libasf/SOURCES
diff --git a/apps/codecs/libasf/asf.c b/lib/rbcodec/codecs/libasf/asf.c
similarity index 100%
rename from apps/codecs/libasf/asf.c
rename to lib/rbcodec/codecs/libasf/asf.c
diff --git a/apps/codecs/libasf/asf.h b/lib/rbcodec/codecs/libasf/asf.h
similarity index 100%
rename from apps/codecs/libasf/asf.h
rename to lib/rbcodec/codecs/libasf/asf.h
diff --git a/apps/codecs/libasf/libasf.make b/lib/rbcodec/codecs/libasf/libasf.make
similarity index 89%
rename from apps/codecs/libasf/libasf.make
rename to lib/rbcodec/codecs/libasf/libasf.make
index 143d83f549..dad0570402 100644
--- a/apps/codecs/libasf/libasf.make
+++ b/lib/rbcodec/codecs/libasf/libasf.make
@@ -9,7 +9,7 @@
 
 # libasf
 ASFLIB := $(CODECDIR)/libasf.a
-ASFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libasf/SOURCES)
+ASFLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libasf/SOURCES)
 ASFLIB_OBJ := $(call c2obj, $(ASFLIB_SRC))
 OTHER_SRC += $(ASFLIB_SRC)
 
diff --git a/apps/codecs/libatrac/README.rockbox b/lib/rbcodec/codecs/libatrac/README.rockbox
similarity index 100%
rename from apps/codecs/libatrac/README.rockbox
rename to lib/rbcodec/codecs/libatrac/README.rockbox
diff --git a/apps/codecs/libatrac/SOURCES b/lib/rbcodec/codecs/libatrac/SOURCES
similarity index 100%
rename from apps/codecs/libatrac/SOURCES
rename to lib/rbcodec/codecs/libatrac/SOURCES
diff --git a/apps/codecs/libatrac/atrac3.c b/lib/rbcodec/codecs/libatrac/atrac3.c
similarity index 100%
rename from apps/codecs/libatrac/atrac3.c
rename to lib/rbcodec/codecs/libatrac/atrac3.c
diff --git a/apps/codecs/libatrac/atrac3.h b/lib/rbcodec/codecs/libatrac/atrac3.h
similarity index 100%
rename from apps/codecs/libatrac/atrac3.h
rename to lib/rbcodec/codecs/libatrac/atrac3.h
diff --git a/apps/codecs/libatrac/atrac3_arm.S b/lib/rbcodec/codecs/libatrac/atrac3_arm.S
similarity index 100%
rename from apps/codecs/libatrac/atrac3_arm.S
rename to lib/rbcodec/codecs/libatrac/atrac3_arm.S
diff --git a/apps/codecs/libatrac/atrac3_armv5e.S b/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S
similarity index 100%
rename from apps/codecs/libatrac/atrac3_armv5e.S
rename to lib/rbcodec/codecs/libatrac/atrac3_armv5e.S
diff --git a/apps/codecs/libatrac/atrac3data.h b/lib/rbcodec/codecs/libatrac/atrac3data.h
similarity index 100%
rename from apps/codecs/libatrac/atrac3data.h
rename to lib/rbcodec/codecs/libatrac/atrac3data.h
diff --git a/apps/codecs/libatrac/atrac3data_fixed.h b/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
similarity index 100%
rename from apps/codecs/libatrac/atrac3data_fixed.h
rename to lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
diff --git a/apps/codecs/libatrac/fixp_math.h b/lib/rbcodec/codecs/libatrac/fixp_math.h
similarity index 100%
rename from apps/codecs/libatrac/fixp_math.h
rename to lib/rbcodec/codecs/libatrac/fixp_math.h
diff --git a/apps/codecs/libatrac/libatrac.make b/lib/rbcodec/codecs/libatrac/libatrac.make
similarity index 89%
rename from apps/codecs/libatrac/libatrac.make
rename to lib/rbcodec/codecs/libatrac/libatrac.make
index 01606e1f15..69a66eb6f5 100644
--- a/apps/codecs/libatrac/libatrac.make
+++ b/lib/rbcodec/codecs/libatrac/libatrac.make
@@ -9,7 +9,7 @@
 
 # libatrac
 ATRACLIB := $(CODECDIR)/libatrac.a
-ATRACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libatrac/SOURCES)
+ATRACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libatrac/SOURCES)
 ATRACLIB_OBJ := $(call c2obj, $(ATRACLIB_SRC))
 OTHER_SRC += $(ATRACLIB_SRC)
 
diff --git a/apps/codecs/libcook/README.rockbox b/lib/rbcodec/codecs/libcook/README.rockbox
similarity index 100%
rename from apps/codecs/libcook/README.rockbox
rename to lib/rbcodec/codecs/libcook/README.rockbox
diff --git a/apps/codecs/libcook/SOURCES b/lib/rbcodec/codecs/libcook/SOURCES
similarity index 100%
rename from apps/codecs/libcook/SOURCES
rename to lib/rbcodec/codecs/libcook/SOURCES
diff --git a/apps/codecs/libcook/cook.c b/lib/rbcodec/codecs/libcook/cook.c
similarity index 100%
rename from apps/codecs/libcook/cook.c
rename to lib/rbcodec/codecs/libcook/cook.c
diff --git a/apps/codecs/libcook/cook.h b/lib/rbcodec/codecs/libcook/cook.h
similarity index 100%
rename from apps/codecs/libcook/cook.h
rename to lib/rbcodec/codecs/libcook/cook.h
diff --git a/apps/codecs/libcook/cook_fixpoint.h b/lib/rbcodec/codecs/libcook/cook_fixpoint.h
similarity index 100%
rename from apps/codecs/libcook/cook_fixpoint.h
rename to lib/rbcodec/codecs/libcook/cook_fixpoint.h
diff --git a/apps/codecs/libcook/cookdata.h b/lib/rbcodec/codecs/libcook/cookdata.h
similarity index 100%
rename from apps/codecs/libcook/cookdata.h
rename to lib/rbcodec/codecs/libcook/cookdata.h
diff --git a/apps/codecs/libcook/cookdata_fixpoint.h b/lib/rbcodec/codecs/libcook/cookdata_fixpoint.h
similarity index 100%
rename from apps/codecs/libcook/cookdata_fixpoint.h
rename to lib/rbcodec/codecs/libcook/cookdata_fixpoint.h
diff --git a/apps/codecs/libcook/libcook.make b/lib/rbcodec/codecs/libcook/libcook.make
similarity index 88%
rename from apps/codecs/libcook/libcook.make
rename to lib/rbcodec/codecs/libcook/libcook.make
index c3f1c10319..c7bdca90c5 100644
--- a/apps/codecs/libcook/libcook.make
+++ b/lib/rbcodec/codecs/libcook/libcook.make
@@ -9,7 +9,7 @@
 
 # libcook
 COOKLIB := $(CODECDIR)/libcook.a
-COOKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libcook/SOURCES)
+COOKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libcook/SOURCES)
 COOKLIB_OBJ := $(call c2obj, $(COOKLIB_SRC))
 OTHER_SRC += $(COOKLIB_SRC)
 
diff --git a/apps/codecs/libfaad/COPYING b/lib/rbcodec/codecs/libfaad/COPYING
similarity index 100%
rename from apps/codecs/libfaad/COPYING
rename to lib/rbcodec/codecs/libfaad/COPYING
diff --git a/apps/codecs/libfaad/README b/lib/rbcodec/codecs/libfaad/README
similarity index 100%
rename from apps/codecs/libfaad/README
rename to lib/rbcodec/codecs/libfaad/README
diff --git a/apps/codecs/libfaad/README.rockbox b/lib/rbcodec/codecs/libfaad/README.rockbox
similarity index 100%
rename from apps/codecs/libfaad/README.rockbox
rename to lib/rbcodec/codecs/libfaad/README.rockbox
diff --git a/apps/codecs/libfaad/SOURCES b/lib/rbcodec/codecs/libfaad/SOURCES
similarity index 100%
rename from apps/codecs/libfaad/SOURCES
rename to lib/rbcodec/codecs/libfaad/SOURCES
diff --git a/apps/codecs/libfaad/analysis.h b/lib/rbcodec/codecs/libfaad/analysis.h
similarity index 100%
rename from apps/codecs/libfaad/analysis.h
rename to lib/rbcodec/codecs/libfaad/analysis.h
diff --git a/apps/codecs/libfaad/bits.c b/lib/rbcodec/codecs/libfaad/bits.c
similarity index 100%
rename from apps/codecs/libfaad/bits.c
rename to lib/rbcodec/codecs/libfaad/bits.c
diff --git a/apps/codecs/libfaad/bits.h b/lib/rbcodec/codecs/libfaad/bits.h
similarity index 100%
rename from apps/codecs/libfaad/bits.h
rename to lib/rbcodec/codecs/libfaad/bits.h
diff --git a/apps/codecs/libfaad/codebook/hcb.h b/lib/rbcodec/codecs/libfaad/codebook/hcb.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb.h
diff --git a/apps/codecs/libfaad/codebook/hcb_1.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_1.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
diff --git a/apps/codecs/libfaad/codebook/hcb_10.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_10.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
diff --git a/apps/codecs/libfaad/codebook/hcb_11.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_11.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
diff --git a/apps/codecs/libfaad/codebook/hcb_2.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_2.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
diff --git a/apps/codecs/libfaad/codebook/hcb_3.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_3.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
diff --git a/apps/codecs/libfaad/codebook/hcb_4.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_4.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
diff --git a/apps/codecs/libfaad/codebook/hcb_5.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_5.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
diff --git a/apps/codecs/libfaad/codebook/hcb_6.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_6.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
diff --git a/apps/codecs/libfaad/codebook/hcb_7.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_7.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
diff --git a/apps/codecs/libfaad/codebook/hcb_8.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_8.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
diff --git a/apps/codecs/libfaad/codebook/hcb_9.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_9.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
diff --git a/apps/codecs/libfaad/codebook/hcb_sf.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
similarity index 100%
rename from apps/codecs/libfaad/codebook/hcb_sf.h
rename to lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
diff --git a/apps/codecs/libfaad/common.c b/lib/rbcodec/codecs/libfaad/common.c
similarity index 100%
rename from apps/codecs/libfaad/common.c
rename to lib/rbcodec/codecs/libfaad/common.c
diff --git a/apps/codecs/libfaad/common.h b/lib/rbcodec/codecs/libfaad/common.h
similarity index 100%
rename from apps/codecs/libfaad/common.h
rename to lib/rbcodec/codecs/libfaad/common.h
diff --git a/apps/codecs/libfaad/decoder.c b/lib/rbcodec/codecs/libfaad/decoder.c
similarity index 100%
rename from apps/codecs/libfaad/decoder.c
rename to lib/rbcodec/codecs/libfaad/decoder.c
diff --git a/apps/codecs/libfaad/decoder.h b/lib/rbcodec/codecs/libfaad/decoder.h
similarity index 100%
rename from apps/codecs/libfaad/decoder.h
rename to lib/rbcodec/codecs/libfaad/decoder.h
diff --git a/apps/codecs/libfaad/drc.c b/lib/rbcodec/codecs/libfaad/drc.c
similarity index 100%
rename from apps/codecs/libfaad/drc.c
rename to lib/rbcodec/codecs/libfaad/drc.c
diff --git a/apps/codecs/libfaad/drc.h b/lib/rbcodec/codecs/libfaad/drc.h
similarity index 100%
rename from apps/codecs/libfaad/drc.h
rename to lib/rbcodec/codecs/libfaad/drc.h
diff --git a/apps/codecs/libfaad/drm_dec.c b/lib/rbcodec/codecs/libfaad/drm_dec.c
similarity index 100%
rename from apps/codecs/libfaad/drm_dec.c
rename to lib/rbcodec/codecs/libfaad/drm_dec.c
diff --git a/apps/codecs/libfaad/drm_dec.h b/lib/rbcodec/codecs/libfaad/drm_dec.h
similarity index 100%
rename from apps/codecs/libfaad/drm_dec.h
rename to lib/rbcodec/codecs/libfaad/drm_dec.h
diff --git a/apps/codecs/libfaad/error.c b/lib/rbcodec/codecs/libfaad/error.c
similarity index 100%
rename from apps/codecs/libfaad/error.c
rename to lib/rbcodec/codecs/libfaad/error.c
diff --git a/apps/codecs/libfaad/error.h b/lib/rbcodec/codecs/libfaad/error.h
similarity index 100%
rename from apps/codecs/libfaad/error.h
rename to lib/rbcodec/codecs/libfaad/error.h
diff --git a/apps/codecs/libfaad/faad_config.h b/lib/rbcodec/codecs/libfaad/faad_config.h
similarity index 100%
rename from apps/codecs/libfaad/faad_config.h
rename to lib/rbcodec/codecs/libfaad/faad_config.h
diff --git a/apps/codecs/libfaad/filtbank.c b/lib/rbcodec/codecs/libfaad/filtbank.c
similarity index 100%
rename from apps/codecs/libfaad/filtbank.c
rename to lib/rbcodec/codecs/libfaad/filtbank.c
diff --git a/apps/codecs/libfaad/filtbank.h b/lib/rbcodec/codecs/libfaad/filtbank.h
similarity index 100%
rename from apps/codecs/libfaad/filtbank.h
rename to lib/rbcodec/codecs/libfaad/filtbank.h
diff --git a/apps/codecs/libfaad/fixed.h b/lib/rbcodec/codecs/libfaad/fixed.h
similarity index 100%
rename from apps/codecs/libfaad/fixed.h
rename to lib/rbcodec/codecs/libfaad/fixed.h
diff --git a/apps/codecs/libfaad/hcr.c b/lib/rbcodec/codecs/libfaad/hcr.c
similarity index 100%
rename from apps/codecs/libfaad/hcr.c
rename to lib/rbcodec/codecs/libfaad/hcr.c
diff --git a/apps/codecs/libfaad/huffman.c b/lib/rbcodec/codecs/libfaad/huffman.c
similarity index 100%
rename from apps/codecs/libfaad/huffman.c
rename to lib/rbcodec/codecs/libfaad/huffman.c
diff --git a/apps/codecs/libfaad/huffman.h b/lib/rbcodec/codecs/libfaad/huffman.h
similarity index 100%
rename from apps/codecs/libfaad/huffman.h
rename to lib/rbcodec/codecs/libfaad/huffman.h
diff --git a/apps/codecs/libfaad/ic_predict.c b/lib/rbcodec/codecs/libfaad/ic_predict.c
similarity index 100%
rename from apps/codecs/libfaad/ic_predict.c
rename to lib/rbcodec/codecs/libfaad/ic_predict.c
diff --git a/apps/codecs/libfaad/ic_predict.h b/lib/rbcodec/codecs/libfaad/ic_predict.h
similarity index 100%
rename from apps/codecs/libfaad/ic_predict.h
rename to lib/rbcodec/codecs/libfaad/ic_predict.h
diff --git a/apps/codecs/libfaad/iq_table.h b/lib/rbcodec/codecs/libfaad/iq_table.h
similarity index 100%
rename from apps/codecs/libfaad/iq_table.h
rename to lib/rbcodec/codecs/libfaad/iq_table.h
diff --git a/apps/codecs/libfaad/is.c b/lib/rbcodec/codecs/libfaad/is.c
similarity index 100%
rename from apps/codecs/libfaad/is.c
rename to lib/rbcodec/codecs/libfaad/is.c
diff --git a/apps/codecs/libfaad/is.h b/lib/rbcodec/codecs/libfaad/is.h
similarity index 100%
rename from apps/codecs/libfaad/is.h
rename to lib/rbcodec/codecs/libfaad/is.h
diff --git a/apps/codecs/libfaad/kbd_win.h b/lib/rbcodec/codecs/libfaad/kbd_win.h
similarity index 100%
rename from apps/codecs/libfaad/kbd_win.h
rename to lib/rbcodec/codecs/libfaad/kbd_win.h
diff --git a/apps/codecs/libfaad/libfaad.make b/lib/rbcodec/codecs/libfaad/libfaad.make
similarity index 83%
rename from apps/codecs/libfaad/libfaad.make
rename to lib/rbcodec/codecs/libfaad/libfaad.make
index 4f5fbc322c..ec6998f4d3 100644
--- a/apps/codecs/libfaad/libfaad.make
+++ b/lib/rbcodec/codecs/libfaad/libfaad.make
@@ -9,10 +9,10 @@
 
 # libfaad
 FAADLIB := $(CODECDIR)/libfaad.a
-FAADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libfaad/SOURCES)
+FAADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libfaad/SOURCES)
 FAADLIB_OBJ := $(call c2obj, $(FAADLIB_SRC))
 OTHER_SRC += $(FAADLIB_SRC)
-OTHER_INC += -I$(APPSDIR)/codecs/libfaad
+OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/libfaad
 
 $(FAADLIB): $(FAADLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libfaad/lt_predict.c b/lib/rbcodec/codecs/libfaad/lt_predict.c
similarity index 100%
rename from apps/codecs/libfaad/lt_predict.c
rename to lib/rbcodec/codecs/libfaad/lt_predict.c
diff --git a/apps/codecs/libfaad/lt_predict.h b/lib/rbcodec/codecs/libfaad/lt_predict.h
similarity index 100%
rename from apps/codecs/libfaad/lt_predict.h
rename to lib/rbcodec/codecs/libfaad/lt_predict.h
diff --git a/apps/codecs/libfaad/mp4.c b/lib/rbcodec/codecs/libfaad/mp4.c
similarity index 100%
rename from apps/codecs/libfaad/mp4.c
rename to lib/rbcodec/codecs/libfaad/mp4.c
diff --git a/apps/codecs/libfaad/mp4.h b/lib/rbcodec/codecs/libfaad/mp4.h
similarity index 100%
rename from apps/codecs/libfaad/mp4.h
rename to lib/rbcodec/codecs/libfaad/mp4.h
diff --git a/apps/codecs/libfaad/ms.c b/lib/rbcodec/codecs/libfaad/ms.c
similarity index 100%
rename from apps/codecs/libfaad/ms.c
rename to lib/rbcodec/codecs/libfaad/ms.c
diff --git a/apps/codecs/libfaad/ms.h b/lib/rbcodec/codecs/libfaad/ms.h
similarity index 100%
rename from apps/codecs/libfaad/ms.h
rename to lib/rbcodec/codecs/libfaad/ms.h
diff --git a/apps/codecs/libfaad/output.c b/lib/rbcodec/codecs/libfaad/output.c
similarity index 100%
rename from apps/codecs/libfaad/output.c
rename to lib/rbcodec/codecs/libfaad/output.c
diff --git a/apps/codecs/libfaad/output.h b/lib/rbcodec/codecs/libfaad/output.h
similarity index 100%
rename from apps/codecs/libfaad/output.h
rename to lib/rbcodec/codecs/libfaad/output.h
diff --git a/apps/codecs/libfaad/pns.c b/lib/rbcodec/codecs/libfaad/pns.c
similarity index 100%
rename from apps/codecs/libfaad/pns.c
rename to lib/rbcodec/codecs/libfaad/pns.c
diff --git a/apps/codecs/libfaad/pns.h b/lib/rbcodec/codecs/libfaad/pns.h
similarity index 100%
rename from apps/codecs/libfaad/pns.h
rename to lib/rbcodec/codecs/libfaad/pns.h
diff --git a/apps/codecs/libfaad/ps_dec.c b/lib/rbcodec/codecs/libfaad/ps_dec.c
similarity index 100%
rename from apps/codecs/libfaad/ps_dec.c
rename to lib/rbcodec/codecs/libfaad/ps_dec.c
diff --git a/apps/codecs/libfaad/ps_dec.h b/lib/rbcodec/codecs/libfaad/ps_dec.h
similarity index 100%
rename from apps/codecs/libfaad/ps_dec.h
rename to lib/rbcodec/codecs/libfaad/ps_dec.h
diff --git a/apps/codecs/libfaad/ps_syntax.c b/lib/rbcodec/codecs/libfaad/ps_syntax.c
similarity index 100%
rename from apps/codecs/libfaad/ps_syntax.c
rename to lib/rbcodec/codecs/libfaad/ps_syntax.c
diff --git a/apps/codecs/libfaad/ps_tables.h b/lib/rbcodec/codecs/libfaad/ps_tables.h
similarity index 100%
rename from apps/codecs/libfaad/ps_tables.h
rename to lib/rbcodec/codecs/libfaad/ps_tables.h
diff --git a/apps/codecs/libfaad/pulse.c b/lib/rbcodec/codecs/libfaad/pulse.c
similarity index 100%
rename from apps/codecs/libfaad/pulse.c
rename to lib/rbcodec/codecs/libfaad/pulse.c
diff --git a/apps/codecs/libfaad/pulse.h b/lib/rbcodec/codecs/libfaad/pulse.h
similarity index 100%
rename from apps/codecs/libfaad/pulse.h
rename to lib/rbcodec/codecs/libfaad/pulse.h
diff --git a/apps/codecs/libfaad/rvlc.c b/lib/rbcodec/codecs/libfaad/rvlc.c
similarity index 100%
rename from apps/codecs/libfaad/rvlc.c
rename to lib/rbcodec/codecs/libfaad/rvlc.c
diff --git a/apps/codecs/libfaad/rvlc.h b/lib/rbcodec/codecs/libfaad/rvlc.h
similarity index 100%
rename from apps/codecs/libfaad/rvlc.h
rename to lib/rbcodec/codecs/libfaad/rvlc.h
diff --git a/apps/codecs/libfaad/sbr_dct.c b/lib/rbcodec/codecs/libfaad/sbr_dct.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_dct.c
rename to lib/rbcodec/codecs/libfaad/sbr_dct.c
diff --git a/apps/codecs/libfaad/sbr_dct.h b/lib/rbcodec/codecs/libfaad/sbr_dct.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_dct.h
rename to lib/rbcodec/codecs/libfaad/sbr_dct.h
diff --git a/apps/codecs/libfaad/sbr_dec.c b/lib/rbcodec/codecs/libfaad/sbr_dec.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_dec.c
rename to lib/rbcodec/codecs/libfaad/sbr_dec.c
diff --git a/apps/codecs/libfaad/sbr_dec.h b/lib/rbcodec/codecs/libfaad/sbr_dec.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_dec.h
rename to lib/rbcodec/codecs/libfaad/sbr_dec.h
diff --git a/apps/codecs/libfaad/sbr_e_nf.c b/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_e_nf.c
rename to lib/rbcodec/codecs/libfaad/sbr_e_nf.c
diff --git a/apps/codecs/libfaad/sbr_e_nf.h b/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_e_nf.h
rename to lib/rbcodec/codecs/libfaad/sbr_e_nf.h
diff --git a/apps/codecs/libfaad/sbr_fbt.c b/lib/rbcodec/codecs/libfaad/sbr_fbt.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_fbt.c
rename to lib/rbcodec/codecs/libfaad/sbr_fbt.c
diff --git a/apps/codecs/libfaad/sbr_fbt.h b/lib/rbcodec/codecs/libfaad/sbr_fbt.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_fbt.h
rename to lib/rbcodec/codecs/libfaad/sbr_fbt.h
diff --git a/apps/codecs/libfaad/sbr_hfadj.c b/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_hfadj.c
rename to lib/rbcodec/codecs/libfaad/sbr_hfadj.c
diff --git a/apps/codecs/libfaad/sbr_hfadj.h b/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_hfadj.h
rename to lib/rbcodec/codecs/libfaad/sbr_hfadj.h
diff --git a/apps/codecs/libfaad/sbr_hfgen.c b/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_hfgen.c
rename to lib/rbcodec/codecs/libfaad/sbr_hfgen.c
diff --git a/apps/codecs/libfaad/sbr_hfgen.h b/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_hfgen.h
rename to lib/rbcodec/codecs/libfaad/sbr_hfgen.h
diff --git a/apps/codecs/libfaad/sbr_huff.c b/lib/rbcodec/codecs/libfaad/sbr_huff.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_huff.c
rename to lib/rbcodec/codecs/libfaad/sbr_huff.c
diff --git a/apps/codecs/libfaad/sbr_huff.h b/lib/rbcodec/codecs/libfaad/sbr_huff.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_huff.h
rename to lib/rbcodec/codecs/libfaad/sbr_huff.h
diff --git a/apps/codecs/libfaad/sbr_noise.h b/lib/rbcodec/codecs/libfaad/sbr_noise.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_noise.h
rename to lib/rbcodec/codecs/libfaad/sbr_noise.h
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/lib/rbcodec/codecs/libfaad/sbr_qmf.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_qmf.c
rename to lib/rbcodec/codecs/libfaad/sbr_qmf.c
diff --git a/apps/codecs/libfaad/sbr_qmf.h b/lib/rbcodec/codecs/libfaad/sbr_qmf.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_qmf.h
rename to lib/rbcodec/codecs/libfaad/sbr_qmf.h
diff --git a/apps/codecs/libfaad/sbr_qmf_c.h b/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_qmf_c.h
rename to lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
diff --git a/apps/codecs/libfaad/sbr_syntax.c b/lib/rbcodec/codecs/libfaad/sbr_syntax.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_syntax.c
rename to lib/rbcodec/codecs/libfaad/sbr_syntax.c
diff --git a/apps/codecs/libfaad/sbr_syntax.h b/lib/rbcodec/codecs/libfaad/sbr_syntax.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_syntax.h
rename to lib/rbcodec/codecs/libfaad/sbr_syntax.h
diff --git a/apps/codecs/libfaad/sbr_tf_grid.c b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
similarity index 100%
rename from apps/codecs/libfaad/sbr_tf_grid.c
rename to lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
diff --git a/apps/codecs/libfaad/sbr_tf_grid.h b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
similarity index 100%
rename from apps/codecs/libfaad/sbr_tf_grid.h
rename to lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
diff --git a/apps/codecs/libfaad/sine_win.h b/lib/rbcodec/codecs/libfaad/sine_win.h
similarity index 100%
rename from apps/codecs/libfaad/sine_win.h
rename to lib/rbcodec/codecs/libfaad/sine_win.h
diff --git a/apps/codecs/libfaad/specrec.c b/lib/rbcodec/codecs/libfaad/specrec.c
similarity index 100%
rename from apps/codecs/libfaad/specrec.c
rename to lib/rbcodec/codecs/libfaad/specrec.c
diff --git a/apps/codecs/libfaad/specrec.h b/lib/rbcodec/codecs/libfaad/specrec.h
similarity index 100%
rename from apps/codecs/libfaad/specrec.h
rename to lib/rbcodec/codecs/libfaad/specrec.h
diff --git a/apps/codecs/libfaad/structs.h b/lib/rbcodec/codecs/libfaad/structs.h
similarity index 100%
rename from apps/codecs/libfaad/structs.h
rename to lib/rbcodec/codecs/libfaad/structs.h
diff --git a/apps/codecs/libfaad/syntax.c b/lib/rbcodec/codecs/libfaad/syntax.c
similarity index 100%
rename from apps/codecs/libfaad/syntax.c
rename to lib/rbcodec/codecs/libfaad/syntax.c
diff --git a/apps/codecs/libfaad/syntax.h b/lib/rbcodec/codecs/libfaad/syntax.h
similarity index 100%
rename from apps/codecs/libfaad/syntax.h
rename to lib/rbcodec/codecs/libfaad/syntax.h
diff --git a/apps/codecs/libfaad/tns.c b/lib/rbcodec/codecs/libfaad/tns.c
similarity index 100%
rename from apps/codecs/libfaad/tns.c
rename to lib/rbcodec/codecs/libfaad/tns.c
diff --git a/apps/codecs/libfaad/tns.h b/lib/rbcodec/codecs/libfaad/tns.h
similarity index 100%
rename from apps/codecs/libfaad/tns.h
rename to lib/rbcodec/codecs/libfaad/tns.h
diff --git a/apps/codecs/libffmpegFLAC/COPYING b/lib/rbcodec/codecs/libffmpegFLAC/COPYING
similarity index 100%
rename from apps/codecs/libffmpegFLAC/COPYING
rename to lib/rbcodec/codecs/libffmpegFLAC/COPYING
diff --git a/apps/codecs/libffmpegFLAC/README b/lib/rbcodec/codecs/libffmpegFLAC/README
similarity index 100%
rename from apps/codecs/libffmpegFLAC/README
rename to lib/rbcodec/codecs/libffmpegFLAC/README
diff --git a/apps/codecs/libffmpegFLAC/README.rockbox b/lib/rbcodec/codecs/libffmpegFLAC/README.rockbox
similarity index 100%
rename from apps/codecs/libffmpegFLAC/README.rockbox
rename to lib/rbcodec/codecs/libffmpegFLAC/README.rockbox
diff --git a/apps/codecs/libffmpegFLAC/SOURCES b/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
similarity index 100%
rename from apps/codecs/libffmpegFLAC/SOURCES
rename to lib/rbcodec/codecs/libffmpegFLAC/SOURCES
diff --git a/apps/codecs/libffmpegFLAC/arm.S b/lib/rbcodec/codecs/libffmpegFLAC/arm.S
similarity index 100%
rename from apps/codecs/libffmpegFLAC/arm.S
rename to lib/rbcodec/codecs/libffmpegFLAC/arm.S
diff --git a/apps/codecs/libffmpegFLAC/arm.h b/lib/rbcodec/codecs/libffmpegFLAC/arm.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/arm.h
rename to lib/rbcodec/codecs/libffmpegFLAC/arm.h
diff --git a/apps/codecs/libffmpegFLAC/bitstream.h b/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/bitstream.h
rename to lib/rbcodec/codecs/libffmpegFLAC/bitstream.h
diff --git a/apps/codecs/libffmpegFLAC/coldfire.S b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
similarity index 100%
rename from apps/codecs/libffmpegFLAC/coldfire.S
rename to lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
diff --git a/apps/codecs/libffmpegFLAC/coldfire.h b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/coldfire.h
rename to lib/rbcodec/codecs/libffmpegFLAC/coldfire.h
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
similarity index 100%
rename from apps/codecs/libffmpegFLAC/decoder.c
rename to lib/rbcodec/codecs/libffmpegFLAC/decoder.c
diff --git a/apps/codecs/libffmpegFLAC/decoder.h b/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/decoder.h
rename to lib/rbcodec/codecs/libffmpegFLAC/decoder.h
diff --git a/apps/codecs/libffmpegFLAC/golomb.h b/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/golomb.h
rename to lib/rbcodec/codecs/libffmpegFLAC/golomb.h
diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
similarity index 88%
rename from apps/codecs/libffmpegFLAC/libffmpegFLAC.make
rename to lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
index 734f3d2d8e..7ae7e96b26 100644
--- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
+++ b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
@@ -9,7 +9,7 @@
 
 # libffmpegFLAC
 FFMPEGFLACLIB := $(CODECDIR)/libffmpegFLAC.a
-FFMPEGFLACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libffmpegFLAC/SOURCES)
+FFMPEGFLACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libffmpegFLAC/SOURCES)
 FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC))
 OTHER_SRC += $(FFMPEGFLACLIB_SRC)
 
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/lib/rbcodec/codecs/libffmpegFLAC/shndec.c
similarity index 100%
rename from apps/codecs/libffmpegFLAC/shndec.c
rename to lib/rbcodec/codecs/libffmpegFLAC/shndec.c
diff --git a/apps/codecs/libffmpegFLAC/shndec.h b/lib/rbcodec/codecs/libffmpegFLAC/shndec.h
similarity index 100%
rename from apps/codecs/libffmpegFLAC/shndec.h
rename to lib/rbcodec/codecs/libffmpegFLAC/shndec.h
diff --git a/apps/codecs/libgme/2413tone.h b/lib/rbcodec/codecs/libgme/2413tone.h
similarity index 100%
rename from apps/codecs/libgme/2413tone.h
rename to lib/rbcodec/codecs/libgme/2413tone.h
diff --git a/apps/codecs/libgme/281btone.h b/lib/rbcodec/codecs/libgme/281btone.h
similarity index 100%
rename from apps/codecs/libgme/281btone.h
rename to lib/rbcodec/codecs/libgme/281btone.h
diff --git a/apps/codecs/libgme/AYSOURCES b/lib/rbcodec/codecs/libgme/AYSOURCES
similarity index 100%
rename from apps/codecs/libgme/AYSOURCES
rename to lib/rbcodec/codecs/libgme/AYSOURCES
diff --git a/apps/codecs/libgme/EMU2413SOURCES b/lib/rbcodec/codecs/libgme/EMU2413SOURCES
similarity index 100%
rename from apps/codecs/libgme/EMU2413SOURCES
rename to lib/rbcodec/codecs/libgme/EMU2413SOURCES
diff --git a/apps/codecs/libgme/GBSSOURCES b/lib/rbcodec/codecs/libgme/GBSSOURCES
similarity index 100%
rename from apps/codecs/libgme/GBSSOURCES
rename to lib/rbcodec/codecs/libgme/GBSSOURCES
diff --git a/apps/codecs/libgme/HESSOURCES b/lib/rbcodec/codecs/libgme/HESSOURCES
similarity index 100%
rename from apps/codecs/libgme/HESSOURCES
rename to lib/rbcodec/codecs/libgme/HESSOURCES
diff --git a/apps/codecs/libgme/KSSSOURCES b/lib/rbcodec/codecs/libgme/KSSSOURCES
similarity index 100%
rename from apps/codecs/libgme/KSSSOURCES
rename to lib/rbcodec/codecs/libgme/KSSSOURCES
diff --git a/apps/codecs/libgme/NSFSOURCES b/lib/rbcodec/codecs/libgme/NSFSOURCES
similarity index 100%
rename from apps/codecs/libgme/NSFSOURCES
rename to lib/rbcodec/codecs/libgme/NSFSOURCES
diff --git a/apps/codecs/libgme/SGCSOURCES b/lib/rbcodec/codecs/libgme/SGCSOURCES
similarity index 100%
rename from apps/codecs/libgme/SGCSOURCES
rename to lib/rbcodec/codecs/libgme/SGCSOURCES
diff --git a/apps/codecs/libgme/VGMSOURCES b/lib/rbcodec/codecs/libgme/VGMSOURCES
similarity index 100%
rename from apps/codecs/libgme/VGMSOURCES
rename to lib/rbcodec/codecs/libgme/VGMSOURCES
diff --git a/apps/codecs/libgme/ay_apu.c b/lib/rbcodec/codecs/libgme/ay_apu.c
similarity index 100%
rename from apps/codecs/libgme/ay_apu.c
rename to lib/rbcodec/codecs/libgme/ay_apu.c
diff --git a/apps/codecs/libgme/ay_apu.h b/lib/rbcodec/codecs/libgme/ay_apu.h
similarity index 100%
rename from apps/codecs/libgme/ay_apu.h
rename to lib/rbcodec/codecs/libgme/ay_apu.h
diff --git a/apps/codecs/libgme/ay_cpu.c b/lib/rbcodec/codecs/libgme/ay_cpu.c
similarity index 100%
rename from apps/codecs/libgme/ay_cpu.c
rename to lib/rbcodec/codecs/libgme/ay_cpu.c
diff --git a/apps/codecs/libgme/ay_emu.c b/lib/rbcodec/codecs/libgme/ay_emu.c
similarity index 100%
rename from apps/codecs/libgme/ay_emu.c
rename to lib/rbcodec/codecs/libgme/ay_emu.c
diff --git a/apps/codecs/libgme/ay_emu.h b/lib/rbcodec/codecs/libgme/ay_emu.h
similarity index 100%
rename from apps/codecs/libgme/ay_emu.h
rename to lib/rbcodec/codecs/libgme/ay_emu.h
diff --git a/apps/codecs/libgme/blargg_common.h b/lib/rbcodec/codecs/libgme/blargg_common.h
similarity index 100%
rename from apps/codecs/libgme/blargg_common.h
rename to lib/rbcodec/codecs/libgme/blargg_common.h
diff --git a/apps/codecs/libgme/blargg_config.h b/lib/rbcodec/codecs/libgme/blargg_config.h
similarity index 100%
rename from apps/codecs/libgme/blargg_config.h
rename to lib/rbcodec/codecs/libgme/blargg_config.h
diff --git a/apps/codecs/libgme/blargg_endian.h b/lib/rbcodec/codecs/libgme/blargg_endian.h
similarity index 100%
rename from apps/codecs/libgme/blargg_endian.h
rename to lib/rbcodec/codecs/libgme/blargg_endian.h
diff --git a/apps/codecs/libgme/blargg_source.h b/lib/rbcodec/codecs/libgme/blargg_source.h
similarity index 100%
rename from apps/codecs/libgme/blargg_source.h
rename to lib/rbcodec/codecs/libgme/blargg_source.h
diff --git a/apps/codecs/libgme/blip_buffer.c b/lib/rbcodec/codecs/libgme/blip_buffer.c
similarity index 100%
rename from apps/codecs/libgme/blip_buffer.c
rename to lib/rbcodec/codecs/libgme/blip_buffer.c
diff --git a/apps/codecs/libgme/blip_buffer.h b/lib/rbcodec/codecs/libgme/blip_buffer.h
similarity index 100%
rename from apps/codecs/libgme/blip_buffer.h
rename to lib/rbcodec/codecs/libgme/blip_buffer.h
diff --git a/apps/codecs/libgme/emu2413.c b/lib/rbcodec/codecs/libgme/emu2413.c
similarity index 100%
rename from apps/codecs/libgme/emu2413.c
rename to lib/rbcodec/codecs/libgme/emu2413.c
diff --git a/apps/codecs/libgme/emu2413.h b/lib/rbcodec/codecs/libgme/emu2413.h
similarity index 100%
rename from apps/codecs/libgme/emu2413.h
rename to lib/rbcodec/codecs/libgme/emu2413.h
diff --git a/apps/codecs/libgme/emu8950.c b/lib/rbcodec/codecs/libgme/emu8950.c
similarity index 100%
rename from apps/codecs/libgme/emu8950.c
rename to lib/rbcodec/codecs/libgme/emu8950.c
diff --git a/apps/codecs/libgme/emu8950.h b/lib/rbcodec/codecs/libgme/emu8950.h
similarity index 100%
rename from apps/codecs/libgme/emu8950.h
rename to lib/rbcodec/codecs/libgme/emu8950.h
diff --git a/apps/codecs/libgme/emuadpcm.c b/lib/rbcodec/codecs/libgme/emuadpcm.c
similarity index 100%
rename from apps/codecs/libgme/emuadpcm.c
rename to lib/rbcodec/codecs/libgme/emuadpcm.c
diff --git a/apps/codecs/libgme/emuadpcm.h b/lib/rbcodec/codecs/libgme/emuadpcm.h
similarity index 100%
rename from apps/codecs/libgme/emuadpcm.h
rename to lib/rbcodec/codecs/libgme/emuadpcm.h
diff --git a/apps/codecs/libgme/emutables.h b/lib/rbcodec/codecs/libgme/emutables.h
similarity index 100%
rename from apps/codecs/libgme/emutables.h
rename to lib/rbcodec/codecs/libgme/emutables.h
diff --git a/apps/codecs/libgme/emutypes.h b/lib/rbcodec/codecs/libgme/emutypes.h
similarity index 100%
rename from apps/codecs/libgme/emutypes.h
rename to lib/rbcodec/codecs/libgme/emutypes.h
diff --git a/apps/codecs/libgme/gb_apu.c b/lib/rbcodec/codecs/libgme/gb_apu.c
similarity index 100%
rename from apps/codecs/libgme/gb_apu.c
rename to lib/rbcodec/codecs/libgme/gb_apu.c
diff --git a/apps/codecs/libgme/gb_apu.h b/lib/rbcodec/codecs/libgme/gb_apu.h
similarity index 100%
rename from apps/codecs/libgme/gb_apu.h
rename to lib/rbcodec/codecs/libgme/gb_apu.h
diff --git a/apps/codecs/libgme/gb_cpu.c b/lib/rbcodec/codecs/libgme/gb_cpu.c
similarity index 100%
rename from apps/codecs/libgme/gb_cpu.c
rename to lib/rbcodec/codecs/libgme/gb_cpu.c
diff --git a/apps/codecs/libgme/gb_cpu.h b/lib/rbcodec/codecs/libgme/gb_cpu.h
similarity index 100%
rename from apps/codecs/libgme/gb_cpu.h
rename to lib/rbcodec/codecs/libgme/gb_cpu.h
diff --git a/apps/codecs/libgme/gb_cpu_run.h b/lib/rbcodec/codecs/libgme/gb_cpu_run.h
similarity index 100%
rename from apps/codecs/libgme/gb_cpu_run.h
rename to lib/rbcodec/codecs/libgme/gb_cpu_run.h
diff --git a/apps/codecs/libgme/gb_oscs.c b/lib/rbcodec/codecs/libgme/gb_oscs.c
similarity index 100%
rename from apps/codecs/libgme/gb_oscs.c
rename to lib/rbcodec/codecs/libgme/gb_oscs.c
diff --git a/apps/codecs/libgme/gb_oscs.h b/lib/rbcodec/codecs/libgme/gb_oscs.h
similarity index 100%
rename from apps/codecs/libgme/gb_oscs.h
rename to lib/rbcodec/codecs/libgme/gb_oscs.h
diff --git a/apps/codecs/libgme/gbs_cpu.c b/lib/rbcodec/codecs/libgme/gbs_cpu.c
similarity index 100%
rename from apps/codecs/libgme/gbs_cpu.c
rename to lib/rbcodec/codecs/libgme/gbs_cpu.c
diff --git a/apps/codecs/libgme/gbs_emu.c b/lib/rbcodec/codecs/libgme/gbs_emu.c
similarity index 100%
rename from apps/codecs/libgme/gbs_emu.c
rename to lib/rbcodec/codecs/libgme/gbs_emu.c
diff --git a/apps/codecs/libgme/gbs_emu.h b/lib/rbcodec/codecs/libgme/gbs_emu.h
similarity index 100%
rename from apps/codecs/libgme/gbs_emu.h
rename to lib/rbcodec/codecs/libgme/gbs_emu.h
diff --git a/apps/codecs/libgme/gme.h b/lib/rbcodec/codecs/libgme/gme.h
similarity index 100%
rename from apps/codecs/libgme/gme.h
rename to lib/rbcodec/codecs/libgme/gme.h
diff --git a/apps/codecs/libgme/hes_apu.c b/lib/rbcodec/codecs/libgme/hes_apu.c
similarity index 100%
rename from apps/codecs/libgme/hes_apu.c
rename to lib/rbcodec/codecs/libgme/hes_apu.c
diff --git a/apps/codecs/libgme/hes_apu.h b/lib/rbcodec/codecs/libgme/hes_apu.h
similarity index 100%
rename from apps/codecs/libgme/hes_apu.h
rename to lib/rbcodec/codecs/libgme/hes_apu.h
diff --git a/apps/codecs/libgme/hes_apu_adpcm.c b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.c
similarity index 100%
rename from apps/codecs/libgme/hes_apu_adpcm.c
rename to lib/rbcodec/codecs/libgme/hes_apu_adpcm.c
diff --git a/apps/codecs/libgme/hes_apu_adpcm.h b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.h
similarity index 100%
rename from apps/codecs/libgme/hes_apu_adpcm.h
rename to lib/rbcodec/codecs/libgme/hes_apu_adpcm.h
diff --git a/apps/codecs/libgme/hes_cpu.c b/lib/rbcodec/codecs/libgme/hes_cpu.c
similarity index 100%
rename from apps/codecs/libgme/hes_cpu.c
rename to lib/rbcodec/codecs/libgme/hes_cpu.c
diff --git a/apps/codecs/libgme/hes_cpu.h b/lib/rbcodec/codecs/libgme/hes_cpu.h
similarity index 100%
rename from apps/codecs/libgme/hes_cpu.h
rename to lib/rbcodec/codecs/libgme/hes_cpu.h
diff --git a/apps/codecs/libgme/hes_cpu_run.h b/lib/rbcodec/codecs/libgme/hes_cpu_run.h
similarity index 100%
rename from apps/codecs/libgme/hes_cpu_run.h
rename to lib/rbcodec/codecs/libgme/hes_cpu_run.h
diff --git a/apps/codecs/libgme/hes_emu.c b/lib/rbcodec/codecs/libgme/hes_emu.c
similarity index 100%
rename from apps/codecs/libgme/hes_emu.c
rename to lib/rbcodec/codecs/libgme/hes_emu.c
diff --git a/apps/codecs/libgme/hes_emu.h b/lib/rbcodec/codecs/libgme/hes_emu.h
similarity index 100%
rename from apps/codecs/libgme/hes_emu.h
rename to lib/rbcodec/codecs/libgme/hes_emu.h
diff --git a/apps/codecs/libgme/inflate/bbfuncs.c b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
similarity index 100%
rename from apps/codecs/libgme/inflate/bbfuncs.c
rename to lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
diff --git a/apps/codecs/libgme/inflate/bbfuncs.h b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
similarity index 100%
rename from apps/codecs/libgme/inflate/bbfuncs.h
rename to lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
diff --git a/apps/codecs/libgme/inflate/inflate.c b/lib/rbcodec/codecs/libgme/inflate/inflate.c
similarity index 100%
rename from apps/codecs/libgme/inflate/inflate.c
rename to lib/rbcodec/codecs/libgme/inflate/inflate.c
diff --git a/apps/codecs/libgme/inflate/inflate.h b/lib/rbcodec/codecs/libgme/inflate/inflate.h
similarity index 100%
rename from apps/codecs/libgme/inflate/inflate.h
rename to lib/rbcodec/codecs/libgme/inflate/inflate.h
diff --git a/apps/codecs/libgme/inflate/mallocer.c b/lib/rbcodec/codecs/libgme/inflate/mallocer.c
similarity index 100%
rename from apps/codecs/libgme/inflate/mallocer.c
rename to lib/rbcodec/codecs/libgme/inflate/mallocer.c
diff --git a/apps/codecs/libgme/inflate/mallocer.h b/lib/rbcodec/codecs/libgme/inflate/mallocer.h
similarity index 100%
rename from apps/codecs/libgme/inflate/mallocer.h
rename to lib/rbcodec/codecs/libgme/inflate/mallocer.h
diff --git a/apps/codecs/libgme/inflate/mbreader.c b/lib/rbcodec/codecs/libgme/inflate/mbreader.c
similarity index 100%
rename from apps/codecs/libgme/inflate/mbreader.c
rename to lib/rbcodec/codecs/libgme/inflate/mbreader.c
diff --git a/apps/codecs/libgme/inflate/mbreader.h b/lib/rbcodec/codecs/libgme/inflate/mbreader.h
similarity index 100%
rename from apps/codecs/libgme/inflate/mbreader.h
rename to lib/rbcodec/codecs/libgme/inflate/mbreader.h
diff --git a/apps/codecs/libgme/kss_cpu.c b/lib/rbcodec/codecs/libgme/kss_cpu.c
similarity index 100%
rename from apps/codecs/libgme/kss_cpu.c
rename to lib/rbcodec/codecs/libgme/kss_cpu.c
diff --git a/apps/codecs/libgme/kss_emu.c b/lib/rbcodec/codecs/libgme/kss_emu.c
similarity index 100%
rename from apps/codecs/libgme/kss_emu.c
rename to lib/rbcodec/codecs/libgme/kss_emu.c
diff --git a/apps/codecs/libgme/kss_emu.h b/lib/rbcodec/codecs/libgme/kss_emu.h
similarity index 100%
rename from apps/codecs/libgme/kss_emu.h
rename to lib/rbcodec/codecs/libgme/kss_emu.h
diff --git a/apps/codecs/libgme/kss_scc_apu.c b/lib/rbcodec/codecs/libgme/kss_scc_apu.c
similarity index 100%
rename from apps/codecs/libgme/kss_scc_apu.c
rename to lib/rbcodec/codecs/libgme/kss_scc_apu.c
diff --git a/apps/codecs/libgme/kss_scc_apu.h b/lib/rbcodec/codecs/libgme/kss_scc_apu.h
similarity index 100%
rename from apps/codecs/libgme/kss_scc_apu.h
rename to lib/rbcodec/codecs/libgme/kss_scc_apu.h
diff --git a/apps/codecs/libgme/libay.make b/lib/rbcodec/codecs/libgme/libay.make
similarity index 73%
rename from apps/codecs/libgme/libay.make
rename to lib/rbcodec/codecs/libgme/libay.make
index 0b5691c1f1..135ad041d3 100644
--- a/apps/codecs/libgme/libay.make
+++ b/lib/rbcodec/codecs/libgme/libay.make
@@ -1,7 +1,7 @@
 
 # libay
 AYLIB := $(CODECDIR)/libay.a
-AYLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/AYSOURCES)
+AYLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/AYSOURCES)
 AYLIB_OBJ := $(call c2obj, $(AYLIB_SRC))
 OTHER_SRC += $(AYLIB_SRC)
 
diff --git a/apps/codecs/libgme/libemu2413.make b/lib/rbcodec/codecs/libgme/libemu2413.make
similarity index 74%
rename from apps/codecs/libgme/libemu2413.make
rename to lib/rbcodec/codecs/libgme/libemu2413.make
index 2f489ced46..4d596dd93e 100644
--- a/apps/codecs/libgme/libemu2413.make
+++ b/lib/rbcodec/codecs/libgme/libemu2413.make
@@ -1,7 +1,7 @@
 
 # libemu2413
 EMU2413LIB := $(CODECDIR)/libemu2413.a
-EMU2413LIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/EMU2413SOURCES)
+EMU2413LIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/EMU2413SOURCES)
 EMU2413LIB_OBJ := $(call c2obj, $(EMU2413LIB_SRC))
 OTHER_SRC += $(EMU2413LIB_SRC)
 
diff --git a/apps/codecs/libgme/libgbs.make b/lib/rbcodec/codecs/libgme/libgbs.make
similarity index 73%
rename from apps/codecs/libgme/libgbs.make
rename to lib/rbcodec/codecs/libgme/libgbs.make
index 6661a4994f..c6f872d6be 100644
--- a/apps/codecs/libgme/libgbs.make
+++ b/lib/rbcodec/codecs/libgme/libgbs.make
@@ -1,7 +1,7 @@
 
 # libgbs
 GBSLIB := $(CODECDIR)/libgbs.a
-GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/GBSSOURCES)
+GBSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/GBSSOURCES)
 GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
 OTHER_SRC += $(GBSLIB_SRC)
 
diff --git a/apps/codecs/libgme/libhes.make b/lib/rbcodec/codecs/libgme/libhes.make
similarity index 73%
rename from apps/codecs/libgme/libhes.make
rename to lib/rbcodec/codecs/libgme/libhes.make
index 81e29f8c5a..1d99f6a192 100644
--- a/apps/codecs/libgme/libhes.make
+++ b/lib/rbcodec/codecs/libgme/libhes.make
@@ -1,7 +1,7 @@
 
 # libhes
 HESLIB := $(CODECDIR)/libhes.a
-HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/HESSOURCES)
+HESLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/HESSOURCES)
 HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
 OTHER_SRC += $(HESLIB_SRC)
 
diff --git a/apps/codecs/libgme/libkss.make b/lib/rbcodec/codecs/libgme/libkss.make
similarity index 73%
rename from apps/codecs/libgme/libkss.make
rename to lib/rbcodec/codecs/libgme/libkss.make
index c93d8d169f..fc12bc22b4 100644
--- a/apps/codecs/libgme/libkss.make
+++ b/lib/rbcodec/codecs/libgme/libkss.make
@@ -1,7 +1,7 @@
 
 # libkss
 KSSLIB := $(CODECDIR)/libkss.a
-KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/KSSSOURCES)
+KSSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/KSSSOURCES)
 KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
 OTHER_SRC += $(KSSLIB_SRC)
 
diff --git a/apps/codecs/libgme/libnsf.make b/lib/rbcodec/codecs/libgme/libnsf.make
similarity index 73%
rename from apps/codecs/libgme/libnsf.make
rename to lib/rbcodec/codecs/libgme/libnsf.make
index 9ab171711a..1e7d56b88a 100644
--- a/apps/codecs/libgme/libnsf.make
+++ b/lib/rbcodec/codecs/libgme/libnsf.make
@@ -1,7 +1,7 @@
 
 # libnsf
 NSFLIB := $(CODECDIR)/libnsf.a
-NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/NSFSOURCES)
+NSFLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/NSFSOURCES)
 NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
 OTHER_SRC += $(NSFLIB_SRC)
 
diff --git a/apps/codecs/libgme/libsgc.make b/lib/rbcodec/codecs/libgme/libsgc.make
similarity index 73%
rename from apps/codecs/libgme/libsgc.make
rename to lib/rbcodec/codecs/libgme/libsgc.make
index ddaec96081..3caa3abd05 100644
--- a/apps/codecs/libgme/libsgc.make
+++ b/lib/rbcodec/codecs/libgme/libsgc.make
@@ -1,7 +1,7 @@
 
 # libsgc
 SGCLIB := $(CODECDIR)/libsgc.a
-SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/SGCSOURCES)
+SGCLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/SGCSOURCES)
 SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
 OTHER_SRC += $(SGCLIB_SRC)
 
diff --git a/apps/codecs/libgme/libvgm.make b/lib/rbcodec/codecs/libgme/libvgm.make
similarity index 73%
rename from apps/codecs/libgme/libvgm.make
rename to lib/rbcodec/codecs/libgme/libvgm.make
index cc492d5143..24efc6ae3d 100644
--- a/apps/codecs/libgme/libvgm.make
+++ b/lib/rbcodec/codecs/libgme/libvgm.make
@@ -1,7 +1,7 @@
 
 # libvgm
 VGMLIB := $(CODECDIR)/libvgm.a
-VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/VGMSOURCES)
+VGMLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/VGMSOURCES)
 VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
 OTHER_SRC += $(VGMLIB_SRC)
 
diff --git a/apps/codecs/libgme/m3u_playlist.h b/lib/rbcodec/codecs/libgme/m3u_playlist.h
similarity index 100%
rename from apps/codecs/libgme/m3u_playlist.h
rename to lib/rbcodec/codecs/libgme/m3u_playlist.h
diff --git a/apps/codecs/libgme/msxtypes.h b/lib/rbcodec/codecs/libgme/msxtypes.h
similarity index 100%
rename from apps/codecs/libgme/msxtypes.h
rename to lib/rbcodec/codecs/libgme/msxtypes.h
diff --git a/apps/codecs/libgme/multi_buffer.c b/lib/rbcodec/codecs/libgme/multi_buffer.c
similarity index 100%
rename from apps/codecs/libgme/multi_buffer.c
rename to lib/rbcodec/codecs/libgme/multi_buffer.c
diff --git a/apps/codecs/libgme/multi_buffer.h b/lib/rbcodec/codecs/libgme/multi_buffer.h
similarity index 100%
rename from apps/codecs/libgme/multi_buffer.h
rename to lib/rbcodec/codecs/libgme/multi_buffer.h
diff --git a/apps/codecs/libgme/nes_apu.c b/lib/rbcodec/codecs/libgme/nes_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_apu.c
rename to lib/rbcodec/codecs/libgme/nes_apu.c
diff --git a/apps/codecs/libgme/nes_apu.h b/lib/rbcodec/codecs/libgme/nes_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_apu.h
rename to lib/rbcodec/codecs/libgme/nes_apu.h
diff --git a/apps/codecs/libgme/nes_cpu.c b/lib/rbcodec/codecs/libgme/nes_cpu.c
similarity index 100%
rename from apps/codecs/libgme/nes_cpu.c
rename to lib/rbcodec/codecs/libgme/nes_cpu.c
diff --git a/apps/codecs/libgme/nes_cpu.h b/lib/rbcodec/codecs/libgme/nes_cpu.h
similarity index 100%
rename from apps/codecs/libgme/nes_cpu.h
rename to lib/rbcodec/codecs/libgme/nes_cpu.h
diff --git a/apps/codecs/libgme/nes_cpu_run.h b/lib/rbcodec/codecs/libgme/nes_cpu_run.h
similarity index 100%
rename from apps/codecs/libgme/nes_cpu_run.h
rename to lib/rbcodec/codecs/libgme/nes_cpu_run.h
diff --git a/apps/codecs/libgme/nes_fds_apu.c b/lib/rbcodec/codecs/libgme/nes_fds_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_fds_apu.c
rename to lib/rbcodec/codecs/libgme/nes_fds_apu.c
diff --git a/apps/codecs/libgme/nes_fds_apu.h b/lib/rbcodec/codecs/libgme/nes_fds_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_fds_apu.h
rename to lib/rbcodec/codecs/libgme/nes_fds_apu.h
diff --git a/apps/codecs/libgme/nes_fme7_apu.c b/lib/rbcodec/codecs/libgme/nes_fme7_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_fme7_apu.c
rename to lib/rbcodec/codecs/libgme/nes_fme7_apu.c
diff --git a/apps/codecs/libgme/nes_fme7_apu.h b/lib/rbcodec/codecs/libgme/nes_fme7_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_fme7_apu.h
rename to lib/rbcodec/codecs/libgme/nes_fme7_apu.h
diff --git a/apps/codecs/libgme/nes_mmc5_apu.h b/lib/rbcodec/codecs/libgme/nes_mmc5_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_mmc5_apu.h
rename to lib/rbcodec/codecs/libgme/nes_mmc5_apu.h
diff --git a/apps/codecs/libgme/nes_namco_apu.c b/lib/rbcodec/codecs/libgme/nes_namco_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_namco_apu.c
rename to lib/rbcodec/codecs/libgme/nes_namco_apu.c
diff --git a/apps/codecs/libgme/nes_namco_apu.h b/lib/rbcodec/codecs/libgme/nes_namco_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_namco_apu.h
rename to lib/rbcodec/codecs/libgme/nes_namco_apu.h
diff --git a/apps/codecs/libgme/nes_oscs.c b/lib/rbcodec/codecs/libgme/nes_oscs.c
similarity index 100%
rename from apps/codecs/libgme/nes_oscs.c
rename to lib/rbcodec/codecs/libgme/nes_oscs.c
diff --git a/apps/codecs/libgme/nes_oscs.h b/lib/rbcodec/codecs/libgme/nes_oscs.h
similarity index 100%
rename from apps/codecs/libgme/nes_oscs.h
rename to lib/rbcodec/codecs/libgme/nes_oscs.h
diff --git a/apps/codecs/libgme/nes_vrc6_apu.c b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_vrc6_apu.c
rename to lib/rbcodec/codecs/libgme/nes_vrc6_apu.c
diff --git a/apps/codecs/libgme/nes_vrc6_apu.h b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_vrc6_apu.h
rename to lib/rbcodec/codecs/libgme/nes_vrc6_apu.h
diff --git a/apps/codecs/libgme/nes_vrc7_apu.c b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.c
similarity index 100%
rename from apps/codecs/libgme/nes_vrc7_apu.c
rename to lib/rbcodec/codecs/libgme/nes_vrc7_apu.c
diff --git a/apps/codecs/libgme/nes_vrc7_apu.h b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.h
similarity index 100%
rename from apps/codecs/libgme/nes_vrc7_apu.h
rename to lib/rbcodec/codecs/libgme/nes_vrc7_apu.h
diff --git a/apps/codecs/libgme/nsf_cpu.c b/lib/rbcodec/codecs/libgme/nsf_cpu.c
similarity index 100%
rename from apps/codecs/libgme/nsf_cpu.c
rename to lib/rbcodec/codecs/libgme/nsf_cpu.c
diff --git a/apps/codecs/libgme/nsf_emu.c b/lib/rbcodec/codecs/libgme/nsf_emu.c
similarity index 100%
rename from apps/codecs/libgme/nsf_emu.c
rename to lib/rbcodec/codecs/libgme/nsf_emu.c
diff --git a/apps/codecs/libgme/nsf_emu.h b/lib/rbcodec/codecs/libgme/nsf_emu.h
similarity index 100%
rename from apps/codecs/libgme/nsf_emu.h
rename to lib/rbcodec/codecs/libgme/nsf_emu.h
diff --git a/apps/codecs/libgme/nsfe_info.c b/lib/rbcodec/codecs/libgme/nsfe_info.c
similarity index 100%
rename from apps/codecs/libgme/nsfe_info.c
rename to lib/rbcodec/codecs/libgme/nsfe_info.c
diff --git a/apps/codecs/libgme/nsfe_info.h b/lib/rbcodec/codecs/libgme/nsfe_info.h
similarity index 100%
rename from apps/codecs/libgme/nsfe_info.h
rename to lib/rbcodec/codecs/libgme/nsfe_info.h
diff --git a/apps/codecs/libgme/opl_apu.c b/lib/rbcodec/codecs/libgme/opl_apu.c
similarity index 100%
rename from apps/codecs/libgme/opl_apu.c
rename to lib/rbcodec/codecs/libgme/opl_apu.c
diff --git a/apps/codecs/libgme/opl_apu.h b/lib/rbcodec/codecs/libgme/opl_apu.h
similarity index 100%
rename from apps/codecs/libgme/opl_apu.h
rename to lib/rbcodec/codecs/libgme/opl_apu.h
diff --git a/apps/codecs/libgme/opltables.h b/lib/rbcodec/codecs/libgme/opltables.h
similarity index 100%
rename from apps/codecs/libgme/opltables.h
rename to lib/rbcodec/codecs/libgme/opltables.h
diff --git a/apps/codecs/libgme/resampler.c b/lib/rbcodec/codecs/libgme/resampler.c
similarity index 100%
rename from apps/codecs/libgme/resampler.c
rename to lib/rbcodec/codecs/libgme/resampler.c
diff --git a/apps/codecs/libgme/resampler.h b/lib/rbcodec/codecs/libgme/resampler.h
similarity index 100%
rename from apps/codecs/libgme/resampler.h
rename to lib/rbcodec/codecs/libgme/resampler.h
diff --git a/apps/codecs/libgme/rom_data.c b/lib/rbcodec/codecs/libgme/rom_data.c
similarity index 100%
rename from apps/codecs/libgme/rom_data.c
rename to lib/rbcodec/codecs/libgme/rom_data.c
diff --git a/apps/codecs/libgme/rom_data.h b/lib/rbcodec/codecs/libgme/rom_data.h
similarity index 100%
rename from apps/codecs/libgme/rom_data.h
rename to lib/rbcodec/codecs/libgme/rom_data.h
diff --git a/apps/codecs/libgme/sgc_cpu.c b/lib/rbcodec/codecs/libgme/sgc_cpu.c
similarity index 100%
rename from apps/codecs/libgme/sgc_cpu.c
rename to lib/rbcodec/codecs/libgme/sgc_cpu.c
diff --git a/apps/codecs/libgme/sgc_emu.c b/lib/rbcodec/codecs/libgme/sgc_emu.c
similarity index 100%
rename from apps/codecs/libgme/sgc_emu.c
rename to lib/rbcodec/codecs/libgme/sgc_emu.c
diff --git a/apps/codecs/libgme/sgc_emu.h b/lib/rbcodec/codecs/libgme/sgc_emu.h
similarity index 100%
rename from apps/codecs/libgme/sgc_emu.h
rename to lib/rbcodec/codecs/libgme/sgc_emu.h
diff --git a/apps/codecs/libgme/sms_apu.c b/lib/rbcodec/codecs/libgme/sms_apu.c
similarity index 100%
rename from apps/codecs/libgme/sms_apu.c
rename to lib/rbcodec/codecs/libgme/sms_apu.c
diff --git a/apps/codecs/libgme/sms_apu.h b/lib/rbcodec/codecs/libgme/sms_apu.h
similarity index 100%
rename from apps/codecs/libgme/sms_apu.h
rename to lib/rbcodec/codecs/libgme/sms_apu.h
diff --git a/apps/codecs/libgme/sms_fm_apu.c b/lib/rbcodec/codecs/libgme/sms_fm_apu.c
similarity index 100%
rename from apps/codecs/libgme/sms_fm_apu.c
rename to lib/rbcodec/codecs/libgme/sms_fm_apu.c
diff --git a/apps/codecs/libgme/sms_fm_apu.h b/lib/rbcodec/codecs/libgme/sms_fm_apu.h
similarity index 100%
rename from apps/codecs/libgme/sms_fm_apu.h
rename to lib/rbcodec/codecs/libgme/sms_fm_apu.h
diff --git a/apps/codecs/libgme/track_filter.c b/lib/rbcodec/codecs/libgme/track_filter.c
similarity index 100%
rename from apps/codecs/libgme/track_filter.c
rename to lib/rbcodec/codecs/libgme/track_filter.c
diff --git a/apps/codecs/libgme/track_filter.h b/lib/rbcodec/codecs/libgme/track_filter.h
similarity index 100%
rename from apps/codecs/libgme/track_filter.h
rename to lib/rbcodec/codecs/libgme/track_filter.h
diff --git a/apps/codecs/libgme/vgm_emu.c b/lib/rbcodec/codecs/libgme/vgm_emu.c
similarity index 100%
rename from apps/codecs/libgme/vgm_emu.c
rename to lib/rbcodec/codecs/libgme/vgm_emu.c
diff --git a/apps/codecs/libgme/vgm_emu.h b/lib/rbcodec/codecs/libgme/vgm_emu.h
similarity index 100%
rename from apps/codecs/libgme/vgm_emu.h
rename to lib/rbcodec/codecs/libgme/vgm_emu.h
diff --git a/apps/codecs/libgme/vrc7tone.h b/lib/rbcodec/codecs/libgme/vrc7tone.h
similarity index 100%
rename from apps/codecs/libgme/vrc7tone.h
rename to lib/rbcodec/codecs/libgme/vrc7tone.h
diff --git a/apps/codecs/libgme/ym2413_emu.c b/lib/rbcodec/codecs/libgme/ym2413_emu.c
similarity index 100%
rename from apps/codecs/libgme/ym2413_emu.c
rename to lib/rbcodec/codecs/libgme/ym2413_emu.c
diff --git a/apps/codecs/libgme/ym2413_emu.h b/lib/rbcodec/codecs/libgme/ym2413_emu.h
similarity index 100%
rename from apps/codecs/libgme/ym2413_emu.h
rename to lib/rbcodec/codecs/libgme/ym2413_emu.h
diff --git a/apps/codecs/libgme/ym2612_emu.c b/lib/rbcodec/codecs/libgme/ym2612_emu.c
similarity index 100%
rename from apps/codecs/libgme/ym2612_emu.c
rename to lib/rbcodec/codecs/libgme/ym2612_emu.c
diff --git a/apps/codecs/libgme/ym2612_emu.h b/lib/rbcodec/codecs/libgme/ym2612_emu.h
similarity index 100%
rename from apps/codecs/libgme/ym2612_emu.h
rename to lib/rbcodec/codecs/libgme/ym2612_emu.h
diff --git a/apps/codecs/libgme/ymtables.h b/lib/rbcodec/codecs/libgme/ymtables.h
similarity index 100%
rename from apps/codecs/libgme/ymtables.h
rename to lib/rbcodec/codecs/libgme/ymtables.h
diff --git a/apps/codecs/libgme/z80_cpu.c b/lib/rbcodec/codecs/libgme/z80_cpu.c
similarity index 100%
rename from apps/codecs/libgme/z80_cpu.c
rename to lib/rbcodec/codecs/libgme/z80_cpu.c
diff --git a/apps/codecs/libgme/z80_cpu.h b/lib/rbcodec/codecs/libgme/z80_cpu.h
similarity index 100%
rename from apps/codecs/libgme/z80_cpu.h
rename to lib/rbcodec/codecs/libgme/z80_cpu.h
diff --git a/apps/codecs/libgme/z80_cpu_run.h b/lib/rbcodec/codecs/libgme/z80_cpu_run.h
similarity index 100%
rename from apps/codecs/libgme/z80_cpu_run.h
rename to lib/rbcodec/codecs/libgme/z80_cpu_run.h
diff --git a/apps/codecs/libm4a/SOURCES b/lib/rbcodec/codecs/libm4a/SOURCES
similarity index 100%
rename from apps/codecs/libm4a/SOURCES
rename to lib/rbcodec/codecs/libm4a/SOURCES
diff --git a/apps/codecs/libm4a/demux.c b/lib/rbcodec/codecs/libm4a/demux.c
similarity index 100%
rename from apps/codecs/libm4a/demux.c
rename to lib/rbcodec/codecs/libm4a/demux.c
diff --git a/apps/codecs/libm4a/libm4a.make b/lib/rbcodec/codecs/libm4a/libm4a.make
similarity index 89%
rename from apps/codecs/libm4a/libm4a.make
rename to lib/rbcodec/codecs/libm4a/libm4a.make
index 9a8a4cb74a..c25f63fa70 100644
--- a/apps/codecs/libm4a/libm4a.make
+++ b/lib/rbcodec/codecs/libm4a/libm4a.make
@@ -9,7 +9,7 @@
 
 # libm4a
 M4ALIB := $(CODECDIR)/libm4a.a
-M4ALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libm4a/SOURCES)
+M4ALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libm4a/SOURCES)
 M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC))
 OTHER_SRC += $(M4ALIB_SRC)
 
diff --git a/apps/codecs/libm4a/m4a.c b/lib/rbcodec/codecs/libm4a/m4a.c
similarity index 100%
rename from apps/codecs/libm4a/m4a.c
rename to lib/rbcodec/codecs/libm4a/m4a.c
diff --git a/apps/codecs/libm4a/m4a.h b/lib/rbcodec/codecs/libm4a/m4a.h
similarity index 100%
rename from apps/codecs/libm4a/m4a.h
rename to lib/rbcodec/codecs/libm4a/m4a.h
diff --git a/apps/codecs/libmad/CHANGES b/lib/rbcodec/codecs/libmad/CHANGES
similarity index 100%
rename from apps/codecs/libmad/CHANGES
rename to lib/rbcodec/codecs/libmad/CHANGES
diff --git a/apps/codecs/libmad/COPYING b/lib/rbcodec/codecs/libmad/COPYING
similarity index 100%
rename from apps/codecs/libmad/COPYING
rename to lib/rbcodec/codecs/libmad/COPYING
diff --git a/apps/codecs/libmad/COPYRIGHT b/lib/rbcodec/codecs/libmad/COPYRIGHT
similarity index 100%
rename from apps/codecs/libmad/COPYRIGHT
rename to lib/rbcodec/codecs/libmad/COPYRIGHT
diff --git a/apps/codecs/libmad/CREDITS b/lib/rbcodec/codecs/libmad/CREDITS
similarity index 100%
rename from apps/codecs/libmad/CREDITS
rename to lib/rbcodec/codecs/libmad/CREDITS
diff --git a/apps/codecs/libmad/D.dat b/lib/rbcodec/codecs/libmad/D.dat
similarity index 100%
rename from apps/codecs/libmad/D.dat
rename to lib/rbcodec/codecs/libmad/D.dat
diff --git a/apps/codecs/libmad/README b/lib/rbcodec/codecs/libmad/README
similarity index 100%
rename from apps/codecs/libmad/README
rename to lib/rbcodec/codecs/libmad/README
diff --git a/apps/codecs/libmad/README.rockbox b/lib/rbcodec/codecs/libmad/README.rockbox
similarity index 100%
rename from apps/codecs/libmad/README.rockbox
rename to lib/rbcodec/codecs/libmad/README.rockbox
diff --git a/apps/codecs/libmad/SOURCES b/lib/rbcodec/codecs/libmad/SOURCES
similarity index 100%
rename from apps/codecs/libmad/SOURCES
rename to lib/rbcodec/codecs/libmad/SOURCES
diff --git a/apps/codecs/libmad/TODO b/lib/rbcodec/codecs/libmad/TODO
similarity index 100%
rename from apps/codecs/libmad/TODO
rename to lib/rbcodec/codecs/libmad/TODO
diff --git a/apps/codecs/libmad/VERSION b/lib/rbcodec/codecs/libmad/VERSION
similarity index 100%
rename from apps/codecs/libmad/VERSION
rename to lib/rbcodec/codecs/libmad/VERSION
diff --git a/apps/codecs/libmad/bit.c b/lib/rbcodec/codecs/libmad/bit.c
similarity index 100%
rename from apps/codecs/libmad/bit.c
rename to lib/rbcodec/codecs/libmad/bit.c
diff --git a/apps/codecs/libmad/bit.h b/lib/rbcodec/codecs/libmad/bit.h
similarity index 100%
rename from apps/codecs/libmad/bit.h
rename to lib/rbcodec/codecs/libmad/bit.h
diff --git a/apps/codecs/libmad/dct32_arm.S b/lib/rbcodec/codecs/libmad/dct32_arm.S
similarity index 100%
rename from apps/codecs/libmad/dct32_arm.S
rename to lib/rbcodec/codecs/libmad/dct32_arm.S
diff --git a/apps/codecs/libmad/fixed.h b/lib/rbcodec/codecs/libmad/fixed.h
similarity index 100%
rename from apps/codecs/libmad/fixed.h
rename to lib/rbcodec/codecs/libmad/fixed.h
diff --git a/apps/codecs/libmad/frame.c b/lib/rbcodec/codecs/libmad/frame.c
similarity index 99%
rename from apps/codecs/libmad/frame.c
rename to lib/rbcodec/codecs/libmad/frame.c
index 61671c7e13..f17306285c 100644
--- a/apps/codecs/libmad/frame.c
+++ b/lib/rbcodec/codecs/libmad/frame.c
@@ -94,7 +94,7 @@ void mad_frame_init(struct mad_frame *frame)
 
   frame->options = 0;
 /* rockbox: comment this to proper zero this array in mad_frame_mute(). overlap
- * is linked to an array in rockbox' apps/codecs/mpa.c before calling this.
+ * is linked to an array in ../mpa.c before calling this.
   frame->overlap = 0;
 */
   mad_frame_mute(frame);
diff --git a/apps/codecs/libmad/frame.h b/lib/rbcodec/codecs/libmad/frame.h
similarity index 100%
rename from apps/codecs/libmad/frame.h
rename to lib/rbcodec/codecs/libmad/frame.h
diff --git a/apps/codecs/libmad/global.h b/lib/rbcodec/codecs/libmad/global.h
similarity index 100%
rename from apps/codecs/libmad/global.h
rename to lib/rbcodec/codecs/libmad/global.h
diff --git a/apps/codecs/libmad/huffman.c b/lib/rbcodec/codecs/libmad/huffman.c
similarity index 100%
rename from apps/codecs/libmad/huffman.c
rename to lib/rbcodec/codecs/libmad/huffman.c
diff --git a/apps/codecs/libmad/huffman.h b/lib/rbcodec/codecs/libmad/huffman.h
similarity index 100%
rename from apps/codecs/libmad/huffman.h
rename to lib/rbcodec/codecs/libmad/huffman.h
diff --git a/apps/codecs/libmad/imdct_l_arm.S b/lib/rbcodec/codecs/libmad/imdct_l_arm.S
similarity index 100%
rename from apps/codecs/libmad/imdct_l_arm.S
rename to lib/rbcodec/codecs/libmad/imdct_l_arm.S
diff --git a/apps/codecs/libmad/imdct_mcf5249.S b/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
similarity index 100%
rename from apps/codecs/libmad/imdct_mcf5249.S
rename to lib/rbcodec/codecs/libmad/imdct_mcf5249.S
diff --git a/apps/codecs/libmad/imdct_s.dat b/lib/rbcodec/codecs/libmad/imdct_s.dat
similarity index 100%
rename from apps/codecs/libmad/imdct_s.dat
rename to lib/rbcodec/codecs/libmad/imdct_s.dat
diff --git a/apps/codecs/libmad/layer12.c b/lib/rbcodec/codecs/libmad/layer12.c
similarity index 100%
rename from apps/codecs/libmad/layer12.c
rename to lib/rbcodec/codecs/libmad/layer12.c
diff --git a/apps/codecs/libmad/layer12.h b/lib/rbcodec/codecs/libmad/layer12.h
similarity index 100%
rename from apps/codecs/libmad/layer12.h
rename to lib/rbcodec/codecs/libmad/layer12.h
diff --git a/apps/codecs/libmad/layer3.c b/lib/rbcodec/codecs/libmad/layer3.c
similarity index 99%
rename from apps/codecs/libmad/layer3.c
rename to lib/rbcodec/codecs/libmad/layer3.c
index a598ff2c95..ffb0fb20ff 100644
--- a/apps/codecs/libmad/layer3.c
+++ b/lib/rbcodec/codecs/libmad/layer3.c
@@ -2926,8 +2926,8 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
 
 #if 0 /* rockbox: do not allocate */
   /* allocate Layer III dynamic structures */
-  /* rockbox: not used. Both pointers are linked to an array in rockbox' 
-   * apps/codecs/mpa.c before calling this. */
+  /* rockbox: not used. Both pointers are linked to an array in
+   * ../mpa.c before calling this. */
   if (stream->main_data == 0) {
     stream->main_data = malloc(MAD_BUFFER_MDLEN);
     if (stream->main_data == 0) {
diff --git a/apps/codecs/libmad/layer3.h b/lib/rbcodec/codecs/libmad/layer3.h
similarity index 100%
rename from apps/codecs/libmad/layer3.h
rename to lib/rbcodec/codecs/libmad/layer3.h
diff --git a/apps/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make
similarity index 73%
rename from apps/codecs/libmad/libmad.make
rename to lib/rbcodec/codecs/libmad/libmad.make
index 4ed8ab1e8c..2a8c7b220f 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/lib/rbcodec/codecs/libmad/libmad.make
@@ -12,7 +12,7 @@
 # so a little trickery is necessary
 
 # Extract optimization level ('-O') from compile flags. Will be set later.
-MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad
+MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(RBCODECLIB_DIR)/codecs/libmad
 MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H
 
 # libmad is faster on ARM-targets with -O1 than -O2
@@ -27,7 +27,7 @@ MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
 
 # libmad
 MADLIB := $(CODECDIR)/libmad.a
-MADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES)
+MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES)
 MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC))
 OTHER_SRC += $(MADLIB_SRC)
 
@@ -37,30 +37,30 @@ $(MADLIB): $(MADLIB_OBJ)
 
 # libmad-mpeg
 MPEGMADLIB := $(CODECDIR)/libmad-mpeg.a
-MPEGMADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES)
-MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libmad,$(BUILDDIR)/apps/codecs/libmad-mpeg,$(MPEGMADLIB_SRC))))
+MPEGMADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES)
+MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(RBCODECLIB_DIR)/codecs/libmad,$(RBCODEC_BLD)/codecs/libmad-mpeg,$(MPEGMADLIB_SRC))))
 
 $(MPEGMADLIB): $(MPEGMADLIB_OBJ)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 # pattern rules
 
-$(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.c
+$(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
 		$(CC) $(MPEGMADFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S
+$(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
 		$(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c
+$(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
 		$(CC) $(MADFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S
+$(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
 		$(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libmad/mad.h b/lib/rbcodec/codecs/libmad/mad.h
similarity index 100%
rename from apps/codecs/libmad/mad.h
rename to lib/rbcodec/codecs/libmad/mad.h
diff --git a/apps/codecs/libmad/mad_iram.h b/lib/rbcodec/codecs/libmad/mad_iram.h
similarity index 100%
rename from apps/codecs/libmad/mad_iram.h
rename to lib/rbcodec/codecs/libmad/mad_iram.h
diff --git a/apps/codecs/libmad/qc_table.dat b/lib/rbcodec/codecs/libmad/qc_table.dat
similarity index 100%
rename from apps/codecs/libmad/qc_table.dat
rename to lib/rbcodec/codecs/libmad/qc_table.dat
diff --git a/apps/codecs/libmad/rq_table.dat b/lib/rbcodec/codecs/libmad/rq_table.dat
similarity index 100%
rename from apps/codecs/libmad/rq_table.dat
rename to lib/rbcodec/codecs/libmad/rq_table.dat
diff --git a/apps/codecs/libmad/sf_table.dat b/lib/rbcodec/codecs/libmad/sf_table.dat
similarity index 100%
rename from apps/codecs/libmad/sf_table.dat
rename to lib/rbcodec/codecs/libmad/sf_table.dat
diff --git a/apps/codecs/libmad/stream.c b/lib/rbcodec/codecs/libmad/stream.c
similarity index 98%
rename from apps/codecs/libmad/stream.c
rename to lib/rbcodec/codecs/libmad/stream.c
index 2958afc118..6c8bbcf850 100644
--- a/apps/codecs/libmad/stream.c
+++ b/lib/rbcodec/codecs/libmad/stream.c
@@ -50,7 +50,7 @@ void mad_stream_init(struct mad_stream *stream)
   stream->anc_bitlen = 0;
 
 /* rockbox: comment this to avoid allocation in following code. main_data is
- * linked to an array in rockbox' apps/codecs/mpa.c before calling this.
+ * linked to an array in ../mpa.c before calling this.
   stream->main_data  = 0;
 */
   stream->md_len     = 0;
diff --git a/apps/codecs/libmad/stream.h b/lib/rbcodec/codecs/libmad/stream.h
similarity index 100%
rename from apps/codecs/libmad/stream.h
rename to lib/rbcodec/codecs/libmad/stream.h
diff --git a/apps/codecs/libmad/synth.c b/lib/rbcodec/codecs/libmad/synth.c
similarity index 100%
rename from apps/codecs/libmad/synth.c
rename to lib/rbcodec/codecs/libmad/synth.c
diff --git a/apps/codecs/libmad/synth.h b/lib/rbcodec/codecs/libmad/synth.h
similarity index 100%
rename from apps/codecs/libmad/synth.h
rename to lib/rbcodec/codecs/libmad/synth.h
diff --git a/apps/codecs/libmad/synth_full_arm.S b/lib/rbcodec/codecs/libmad/synth_full_arm.S
similarity index 100%
rename from apps/codecs/libmad/synth_full_arm.S
rename to lib/rbcodec/codecs/libmad/synth_full_arm.S
diff --git a/apps/codecs/libmusepack/AUTHORS b/lib/rbcodec/codecs/libmusepack/AUTHORS
similarity index 100%
rename from apps/codecs/libmusepack/AUTHORS
rename to lib/rbcodec/codecs/libmusepack/AUTHORS
diff --git a/apps/codecs/libmusepack/COPYING b/lib/rbcodec/codecs/libmusepack/COPYING
similarity index 100%
rename from apps/codecs/libmusepack/COPYING
rename to lib/rbcodec/codecs/libmusepack/COPYING
diff --git a/apps/codecs/libmusepack/ChangeLog b/lib/rbcodec/codecs/libmusepack/ChangeLog
similarity index 100%
rename from apps/codecs/libmusepack/ChangeLog
rename to lib/rbcodec/codecs/libmusepack/ChangeLog
diff --git a/apps/codecs/libmusepack/SOURCES b/lib/rbcodec/codecs/libmusepack/SOURCES
similarity index 100%
rename from apps/codecs/libmusepack/SOURCES
rename to lib/rbcodec/codecs/libmusepack/SOURCES
diff --git a/apps/codecs/libmusepack/crc32.c b/lib/rbcodec/codecs/libmusepack/crc32.c
similarity index 100%
rename from apps/codecs/libmusepack/crc32.c
rename to lib/rbcodec/codecs/libmusepack/crc32.c
diff --git a/apps/codecs/libmusepack/decoder.h b/lib/rbcodec/codecs/libmusepack/decoder.h
similarity index 100%
rename from apps/codecs/libmusepack/decoder.h
rename to lib/rbcodec/codecs/libmusepack/decoder.h
diff --git a/apps/codecs/libmusepack/huffman.c b/lib/rbcodec/codecs/libmusepack/huffman.c
similarity index 100%
rename from apps/codecs/libmusepack/huffman.c
rename to lib/rbcodec/codecs/libmusepack/huffman.c
diff --git a/apps/codecs/libmusepack/huffman.h b/lib/rbcodec/codecs/libmusepack/huffman.h
similarity index 100%
rename from apps/codecs/libmusepack/huffman.h
rename to lib/rbcodec/codecs/libmusepack/huffman.h
diff --git a/apps/codecs/libmusepack/internal.h b/lib/rbcodec/codecs/libmusepack/internal.h
similarity index 100%
rename from apps/codecs/libmusepack/internal.h
rename to lib/rbcodec/codecs/libmusepack/internal.h
diff --git a/apps/codecs/libmusepack/libmusepack.make b/lib/rbcodec/codecs/libmusepack/libmusepack.make
similarity index 88%
rename from apps/codecs/libmusepack/libmusepack.make
rename to lib/rbcodec/codecs/libmusepack/libmusepack.make
index ac201c4552..53b07869bf 100644
--- a/apps/codecs/libmusepack/libmusepack.make
+++ b/lib/rbcodec/codecs/libmusepack/libmusepack.make
@@ -9,7 +9,7 @@
 
 # libmusepack
 MUSEPACKLIB := $(CODECDIR)/libmusepack.a
-MUSEPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmusepack/SOURCES)
+MUSEPACKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmusepack/SOURCES)
 MUSEPACKLIB_OBJ := $(call c2obj, $(MUSEPACKLIB_SRC))
 OTHER_SRC += $(MUSEPACKLIB_SRC)
 
diff --git a/apps/codecs/libmusepack/minimax.h b/lib/rbcodec/codecs/libmusepack/minimax.h
similarity index 100%
rename from apps/codecs/libmusepack/minimax.h
rename to lib/rbcodec/codecs/libmusepack/minimax.h
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.c b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.c
similarity index 100%
rename from apps/codecs/libmusepack/mpc_bits_reader.c
rename to lib/rbcodec/codecs/libmusepack/mpc_bits_reader.c
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.h b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.h
similarity index 100%
rename from apps/codecs/libmusepack/mpc_bits_reader.h
rename to lib/rbcodec/codecs/libmusepack/mpc_bits_reader.h
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/lib/rbcodec/codecs/libmusepack/mpc_decoder.c
similarity index 100%
rename from apps/codecs/libmusepack/mpc_decoder.c
rename to lib/rbcodec/codecs/libmusepack/mpc_decoder.c
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/lib/rbcodec/codecs/libmusepack/mpc_demux.c
similarity index 100%
rename from apps/codecs/libmusepack/mpc_demux.c
rename to lib/rbcodec/codecs/libmusepack/mpc_demux.c
diff --git a/apps/codecs/libmusepack/mpc_types.h b/lib/rbcodec/codecs/libmusepack/mpc_types.h
similarity index 100%
rename from apps/codecs/libmusepack/mpc_types.h
rename to lib/rbcodec/codecs/libmusepack/mpc_types.h
diff --git a/apps/codecs/libmusepack/mpcdec.h b/lib/rbcodec/codecs/libmusepack/mpcdec.h
similarity index 100%
rename from apps/codecs/libmusepack/mpcdec.h
rename to lib/rbcodec/codecs/libmusepack/mpcdec.h
diff --git a/apps/codecs/libmusepack/mpcdec_math.h b/lib/rbcodec/codecs/libmusepack/mpcdec_math.h
similarity index 100%
rename from apps/codecs/libmusepack/mpcdec_math.h
rename to lib/rbcodec/codecs/libmusepack/mpcdec_math.h
diff --git a/apps/codecs/libmusepack/reader.h b/lib/rbcodec/codecs/libmusepack/reader.h
similarity index 100%
rename from apps/codecs/libmusepack/reader.h
rename to lib/rbcodec/codecs/libmusepack/reader.h
diff --git a/apps/codecs/libmusepack/requant.c b/lib/rbcodec/codecs/libmusepack/requant.c
similarity index 100%
rename from apps/codecs/libmusepack/requant.c
rename to lib/rbcodec/codecs/libmusepack/requant.c
diff --git a/apps/codecs/libmusepack/requant.h b/lib/rbcodec/codecs/libmusepack/requant.h
similarity index 100%
rename from apps/codecs/libmusepack/requant.h
rename to lib/rbcodec/codecs/libmusepack/requant.h
diff --git a/apps/codecs/libmusepack/streaminfo.c b/lib/rbcodec/codecs/libmusepack/streaminfo.c
similarity index 100%
rename from apps/codecs/libmusepack/streaminfo.c
rename to lib/rbcodec/codecs/libmusepack/streaminfo.c
diff --git a/apps/codecs/libmusepack/streaminfo.h b/lib/rbcodec/codecs/libmusepack/streaminfo.h
similarity index 100%
rename from apps/codecs/libmusepack/streaminfo.h
rename to lib/rbcodec/codecs/libmusepack/streaminfo.h
diff --git a/apps/codecs/libmusepack/synth_filter.c b/lib/rbcodec/codecs/libmusepack/synth_filter.c
similarity index 100%
rename from apps/codecs/libmusepack/synth_filter.c
rename to lib/rbcodec/codecs/libmusepack/synth_filter.c
diff --git a/apps/codecs/libmusepack/synth_filter_arm.S b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
similarity index 100%
rename from apps/codecs/libmusepack/synth_filter_arm.S
rename to lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
diff --git a/apps/codecs/libmusepack/synth_filter_coldfire.S b/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
similarity index 100%
rename from apps/codecs/libmusepack/synth_filter_coldfire.S
rename to lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
diff --git a/apps/codecs/libpcm/SOURCES b/lib/rbcodec/codecs/libpcm/SOURCES
similarity index 100%
rename from apps/codecs/libpcm/SOURCES
rename to lib/rbcodec/codecs/libpcm/SOURCES
diff --git a/apps/codecs/libpcm/adpcm_seek.c b/lib/rbcodec/codecs/libpcm/adpcm_seek.c
similarity index 100%
rename from apps/codecs/libpcm/adpcm_seek.c
rename to lib/rbcodec/codecs/libpcm/adpcm_seek.c
diff --git a/apps/codecs/libpcm/adpcm_seek.h b/lib/rbcodec/codecs/libpcm/adpcm_seek.h
similarity index 100%
rename from apps/codecs/libpcm/adpcm_seek.h
rename to lib/rbcodec/codecs/libpcm/adpcm_seek.h
diff --git a/apps/codecs/libpcm/dialogic_oki_adpcm.c b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/dialogic_oki_adpcm.c
rename to lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
diff --git a/apps/codecs/libpcm/dvi_adpcm.c b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/dvi_adpcm.c
rename to lib/rbcodec/codecs/libpcm/dvi_adpcm.c
diff --git a/apps/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c
similarity index 100%
rename from apps/codecs/libpcm/ieee_float.c
rename to lib/rbcodec/codecs/libpcm/ieee_float.c
diff --git a/apps/codecs/libpcm/ima_adpcm_common.c b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
similarity index 100%
rename from apps/codecs/libpcm/ima_adpcm_common.c
rename to lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
diff --git a/apps/codecs/libpcm/ima_adpcm_common.h b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
similarity index 100%
rename from apps/codecs/libpcm/ima_adpcm_common.h
rename to lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
diff --git a/apps/codecs/libpcm/itut_g711.c b/lib/rbcodec/codecs/libpcm/itut_g711.c
similarity index 100%
rename from apps/codecs/libpcm/itut_g711.c
rename to lib/rbcodec/codecs/libpcm/itut_g711.c
diff --git a/apps/codecs/libpcm/libpcm.make b/lib/rbcodec/codecs/libpcm/libpcm.make
similarity index 89%
rename from apps/codecs/libpcm/libpcm.make
rename to lib/rbcodec/codecs/libpcm/libpcm.make
index 1188bde1b0..15c23bedf2 100644
--- a/apps/codecs/libpcm/libpcm.make
+++ b/lib/rbcodec/codecs/libpcm/libpcm.make
@@ -9,7 +9,7 @@
 
 # libpcm
 PCMSLIB := $(CODECDIR)/libpcm.a
-PCMSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libpcm/SOURCES)
+PCMSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libpcm/SOURCES)
 PCMSLIB_OBJ := $(call c2obj, $(PCMSLIB_SRC))
 OTHER_SRC += $(PCMSLIB_SRC)
 
diff --git a/apps/codecs/libpcm/linear_pcm.c b/lib/rbcodec/codecs/libpcm/linear_pcm.c
similarity index 100%
rename from apps/codecs/libpcm/linear_pcm.c
rename to lib/rbcodec/codecs/libpcm/linear_pcm.c
diff --git a/apps/codecs/libpcm/ms_adpcm.c b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/ms_adpcm.c
rename to lib/rbcodec/codecs/libpcm/ms_adpcm.c
diff --git a/apps/codecs/libpcm/pcm_common.h b/lib/rbcodec/codecs/libpcm/pcm_common.h
similarity index 100%
rename from apps/codecs/libpcm/pcm_common.h
rename to lib/rbcodec/codecs/libpcm/pcm_common.h
diff --git a/apps/codecs/libpcm/qt_ima_adpcm.c b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/qt_ima_adpcm.c
rename to lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
diff --git a/apps/codecs/libpcm/support_formats.h b/lib/rbcodec/codecs/libpcm/support_formats.h
similarity index 100%
rename from apps/codecs/libpcm/support_formats.h
rename to lib/rbcodec/codecs/libpcm/support_formats.h
diff --git a/apps/codecs/libpcm/swf_adpcm.c b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/swf_adpcm.c
rename to lib/rbcodec/codecs/libpcm/swf_adpcm.c
diff --git a/apps/codecs/libpcm/yamaha_adpcm.c b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
similarity index 100%
rename from apps/codecs/libpcm/yamaha_adpcm.c
rename to lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
diff --git a/apps/codecs/librm/SOURCES b/lib/rbcodec/codecs/librm/SOURCES
similarity index 100%
rename from apps/codecs/librm/SOURCES
rename to lib/rbcodec/codecs/librm/SOURCES
diff --git a/apps/codecs/librm/bytestream.h b/lib/rbcodec/codecs/librm/bytestream.h
similarity index 100%
rename from apps/codecs/librm/bytestream.h
rename to lib/rbcodec/codecs/librm/bytestream.h
diff --git a/apps/codecs/librm/librm.make b/lib/rbcodec/codecs/librm/librm.make
similarity index 89%
rename from apps/codecs/librm/librm.make
rename to lib/rbcodec/codecs/librm/librm.make
index 7f2c34c9ac..3c736abec9 100644
--- a/apps/codecs/librm/librm.make
+++ b/lib/rbcodec/codecs/librm/librm.make
@@ -9,7 +9,7 @@
 
 # librm
 RMLIB := $(CODECDIR)/librm.a
-RMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/librm/SOURCES)
+RMLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/librm/SOURCES)
 RMLIB_OBJ := $(call c2obj, $(RMLIB_SRC))
 OTHER_SRC += $(RMLIB_SRC)
 
diff --git a/apps/codecs/librm/rm.c b/lib/rbcodec/codecs/librm/rm.c
similarity index 100%
rename from apps/codecs/librm/rm.c
rename to lib/rbcodec/codecs/librm/rm.c
diff --git a/apps/codecs/librm/rm.h b/lib/rbcodec/codecs/librm/rm.h
similarity index 100%
rename from apps/codecs/librm/rm.h
rename to lib/rbcodec/codecs/librm/rm.h
diff --git a/apps/codecs/libspc/SOURCES b/lib/rbcodec/codecs/libspc/SOURCES
similarity index 100%
rename from apps/codecs/libspc/SOURCES
rename to lib/rbcodec/codecs/libspc/SOURCES
diff --git a/apps/codecs/libspc/libspc.make b/lib/rbcodec/codecs/libspc/libspc.make
similarity index 89%
rename from apps/codecs/libspc/libspc.make
rename to lib/rbcodec/codecs/libspc/libspc.make
index 8cf04dc5c8..a005f7914a 100644
--- a/apps/codecs/libspc/libspc.make
+++ b/lib/rbcodec/codecs/libspc/libspc.make
@@ -9,7 +9,7 @@
 
 # libspc
 SPCLIB := $(CODECDIR)/libspc.a
-SPCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspc/SOURCES)
+SPCLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspc/SOURCES)
 SPCLIB_OBJ := $(call c2obj, $(SPCLIB_SRC))
 OTHER_SRC += $(SPCLIB_SRC)
 
diff --git a/apps/codecs/libspc/spc_codec.h b/lib/rbcodec/codecs/libspc/spc_codec.h
similarity index 100%
rename from apps/codecs/libspc/spc_codec.h
rename to lib/rbcodec/codecs/libspc/spc_codec.h
diff --git a/apps/codecs/libspc/spc_cpu.c b/lib/rbcodec/codecs/libspc/spc_cpu.c
similarity index 100%
rename from apps/codecs/libspc/spc_cpu.c
rename to lib/rbcodec/codecs/libspc/spc_cpu.c
diff --git a/apps/codecs/libspc/spc_dsp.c b/lib/rbcodec/codecs/libspc/spc_dsp.c
similarity index 100%
rename from apps/codecs/libspc/spc_dsp.c
rename to lib/rbcodec/codecs/libspc/spc_dsp.c
diff --git a/apps/codecs/libspc/spc_emu.c b/lib/rbcodec/codecs/libspc/spc_emu.c
similarity index 100%
rename from apps/codecs/libspc/spc_emu.c
rename to lib/rbcodec/codecs/libspc/spc_emu.c
diff --git a/apps/codecs/libspc/spc_profiler.c b/lib/rbcodec/codecs/libspc/spc_profiler.c
similarity index 100%
rename from apps/codecs/libspc/spc_profiler.c
rename to lib/rbcodec/codecs/libspc/spc_profiler.c
diff --git a/apps/codecs/libspc/spc_profiler.h b/lib/rbcodec/codecs/libspc/spc_profiler.h
similarity index 100%
rename from apps/codecs/libspc/spc_profiler.h
rename to lib/rbcodec/codecs/libspc/spc_profiler.h
diff --git a/apps/codecs/libspeex/COPYING b/lib/rbcodec/codecs/libspeex/COPYING
similarity index 100%
rename from apps/codecs/libspeex/COPYING
rename to lib/rbcodec/codecs/libspeex/COPYING
diff --git a/apps/codecs/libspeex/README.rockbox b/lib/rbcodec/codecs/libspeex/README.rockbox
similarity index 100%
rename from apps/codecs/libspeex/README.rockbox
rename to lib/rbcodec/codecs/libspeex/README.rockbox
diff --git a/apps/codecs/libspeex/SOURCES b/lib/rbcodec/codecs/libspeex/SOURCES
similarity index 100%
rename from apps/codecs/libspeex/SOURCES
rename to lib/rbcodec/codecs/libspeex/SOURCES
diff --git a/apps/codecs/libspeex/_kiss_fft_guts.h b/lib/rbcodec/codecs/libspeex/_kiss_fft_guts.h
similarity index 100%
rename from apps/codecs/libspeex/_kiss_fft_guts.h
rename to lib/rbcodec/codecs/libspeex/_kiss_fft_guts.h
diff --git a/apps/codecs/libspeex/arch.h b/lib/rbcodec/codecs/libspeex/arch.h
similarity index 100%
rename from apps/codecs/libspeex/arch.h
rename to lib/rbcodec/codecs/libspeex/arch.h
diff --git a/apps/codecs/libspeex/bits.c b/lib/rbcodec/codecs/libspeex/bits.c
similarity index 100%
rename from apps/codecs/libspeex/bits.c
rename to lib/rbcodec/codecs/libspeex/bits.c
diff --git a/apps/codecs/libspeex/cb_search.c b/lib/rbcodec/codecs/libspeex/cb_search.c
similarity index 100%
rename from apps/codecs/libspeex/cb_search.c
rename to lib/rbcodec/codecs/libspeex/cb_search.c
diff --git a/apps/codecs/libspeex/cb_search.h b/lib/rbcodec/codecs/libspeex/cb_search.h
similarity index 100%
rename from apps/codecs/libspeex/cb_search.h
rename to lib/rbcodec/codecs/libspeex/cb_search.h
diff --git a/apps/codecs/libspeex/cb_search_arm4.h b/lib/rbcodec/codecs/libspeex/cb_search_arm4.h
similarity index 100%
rename from apps/codecs/libspeex/cb_search_arm4.h
rename to lib/rbcodec/codecs/libspeex/cb_search_arm4.h
diff --git a/apps/codecs/libspeex/cb_search_bfin.h b/lib/rbcodec/codecs/libspeex/cb_search_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/cb_search_bfin.h
rename to lib/rbcodec/codecs/libspeex/cb_search_bfin.h
diff --git a/apps/codecs/libspeex/cb_search_sse.h b/lib/rbcodec/codecs/libspeex/cb_search_sse.h
similarity index 100%
rename from apps/codecs/libspeex/cb_search_sse.h
rename to lib/rbcodec/codecs/libspeex/cb_search_sse.h
diff --git a/apps/codecs/libspeex/config-speex.h b/lib/rbcodec/codecs/libspeex/config-speex.h
similarity index 100%
rename from apps/codecs/libspeex/config-speex.h
rename to lib/rbcodec/codecs/libspeex/config-speex.h
diff --git a/apps/codecs/libspeex/exc_10_16_table.c b/lib/rbcodec/codecs/libspeex/exc_10_16_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_10_16_table.c
rename to lib/rbcodec/codecs/libspeex/exc_10_16_table.c
diff --git a/apps/codecs/libspeex/exc_10_32_table.c b/lib/rbcodec/codecs/libspeex/exc_10_32_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_10_32_table.c
rename to lib/rbcodec/codecs/libspeex/exc_10_32_table.c
diff --git a/apps/codecs/libspeex/exc_20_32_table.c b/lib/rbcodec/codecs/libspeex/exc_20_32_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_20_32_table.c
rename to lib/rbcodec/codecs/libspeex/exc_20_32_table.c
diff --git a/apps/codecs/libspeex/exc_5_256_table.c b/lib/rbcodec/codecs/libspeex/exc_5_256_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_5_256_table.c
rename to lib/rbcodec/codecs/libspeex/exc_5_256_table.c
diff --git a/apps/codecs/libspeex/exc_5_64_table.c b/lib/rbcodec/codecs/libspeex/exc_5_64_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_5_64_table.c
rename to lib/rbcodec/codecs/libspeex/exc_5_64_table.c
diff --git a/apps/codecs/libspeex/exc_8_128_table.c b/lib/rbcodec/codecs/libspeex/exc_8_128_table.c
similarity index 100%
rename from apps/codecs/libspeex/exc_8_128_table.c
rename to lib/rbcodec/codecs/libspeex/exc_8_128_table.c
diff --git a/apps/codecs/libspeex/fftwrap.c b/lib/rbcodec/codecs/libspeex/fftwrap.c
similarity index 100%
rename from apps/codecs/libspeex/fftwrap.c
rename to lib/rbcodec/codecs/libspeex/fftwrap.c
diff --git a/apps/codecs/libspeex/fftwrap.h b/lib/rbcodec/codecs/libspeex/fftwrap.h
similarity index 100%
rename from apps/codecs/libspeex/fftwrap.h
rename to lib/rbcodec/codecs/libspeex/fftwrap.h
diff --git a/apps/codecs/libspeex/filterbank.c b/lib/rbcodec/codecs/libspeex/filterbank.c
similarity index 100%
rename from apps/codecs/libspeex/filterbank.c
rename to lib/rbcodec/codecs/libspeex/filterbank.c
diff --git a/apps/codecs/libspeex/filterbank.h b/lib/rbcodec/codecs/libspeex/filterbank.h
similarity index 100%
rename from apps/codecs/libspeex/filterbank.h
rename to lib/rbcodec/codecs/libspeex/filterbank.h
diff --git a/apps/codecs/libspeex/filters.c b/lib/rbcodec/codecs/libspeex/filters.c
similarity index 100%
rename from apps/codecs/libspeex/filters.c
rename to lib/rbcodec/codecs/libspeex/filters.c
diff --git a/apps/codecs/libspeex/filters.h b/lib/rbcodec/codecs/libspeex/filters.h
similarity index 100%
rename from apps/codecs/libspeex/filters.h
rename to lib/rbcodec/codecs/libspeex/filters.h
diff --git a/apps/codecs/libspeex/filters_arm4.S b/lib/rbcodec/codecs/libspeex/filters_arm4.S
similarity index 100%
rename from apps/codecs/libspeex/filters_arm4.S
rename to lib/rbcodec/codecs/libspeex/filters_arm4.S
diff --git a/apps/codecs/libspeex/filters_arm4.h b/lib/rbcodec/codecs/libspeex/filters_arm4.h
similarity index 100%
rename from apps/codecs/libspeex/filters_arm4.h
rename to lib/rbcodec/codecs/libspeex/filters_arm4.h
diff --git a/apps/codecs/libspeex/filters_bfin.h b/lib/rbcodec/codecs/libspeex/filters_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/filters_bfin.h
rename to lib/rbcodec/codecs/libspeex/filters_bfin.h
diff --git a/apps/codecs/libspeex/filters_cf.S b/lib/rbcodec/codecs/libspeex/filters_cf.S
similarity index 100%
rename from apps/codecs/libspeex/filters_cf.S
rename to lib/rbcodec/codecs/libspeex/filters_cf.S
diff --git a/apps/codecs/libspeex/filters_sse.h b/lib/rbcodec/codecs/libspeex/filters_sse.h
similarity index 100%
rename from apps/codecs/libspeex/filters_sse.h
rename to lib/rbcodec/codecs/libspeex/filters_sse.h
diff --git a/apps/codecs/libspeex/fixed_arm4.h b/lib/rbcodec/codecs/libspeex/fixed_arm4.h
similarity index 100%
rename from apps/codecs/libspeex/fixed_arm4.h
rename to lib/rbcodec/codecs/libspeex/fixed_arm4.h
diff --git a/apps/codecs/libspeex/fixed_arm5e.h b/lib/rbcodec/codecs/libspeex/fixed_arm5e.h
similarity index 100%
rename from apps/codecs/libspeex/fixed_arm5e.h
rename to lib/rbcodec/codecs/libspeex/fixed_arm5e.h
diff --git a/apps/codecs/libspeex/fixed_bfin.h b/lib/rbcodec/codecs/libspeex/fixed_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/fixed_bfin.h
rename to lib/rbcodec/codecs/libspeex/fixed_bfin.h
diff --git a/apps/codecs/libspeex/fixed_debug.h b/lib/rbcodec/codecs/libspeex/fixed_debug.h
similarity index 100%
rename from apps/codecs/libspeex/fixed_debug.h
rename to lib/rbcodec/codecs/libspeex/fixed_debug.h
diff --git a/apps/codecs/libspeex/fixed_generic.h b/lib/rbcodec/codecs/libspeex/fixed_generic.h
similarity index 100%
rename from apps/codecs/libspeex/fixed_generic.h
rename to lib/rbcodec/codecs/libspeex/fixed_generic.h
diff --git a/apps/codecs/libspeex/gain_table.c b/lib/rbcodec/codecs/libspeex/gain_table.c
similarity index 100%
rename from apps/codecs/libspeex/gain_table.c
rename to lib/rbcodec/codecs/libspeex/gain_table.c
diff --git a/apps/codecs/libspeex/gain_table_lbr.c b/lib/rbcodec/codecs/libspeex/gain_table_lbr.c
similarity index 100%
rename from apps/codecs/libspeex/gain_table_lbr.c
rename to lib/rbcodec/codecs/libspeex/gain_table_lbr.c
diff --git a/apps/codecs/libspeex/hexc_10_32_table.c b/lib/rbcodec/codecs/libspeex/hexc_10_32_table.c
similarity index 100%
rename from apps/codecs/libspeex/hexc_10_32_table.c
rename to lib/rbcodec/codecs/libspeex/hexc_10_32_table.c
diff --git a/apps/codecs/libspeex/hexc_table.c b/lib/rbcodec/codecs/libspeex/hexc_table.c
similarity index 100%
rename from apps/codecs/libspeex/hexc_table.c
rename to lib/rbcodec/codecs/libspeex/hexc_table.c
diff --git a/apps/codecs/libspeex/high_lsp_tables.c b/lib/rbcodec/codecs/libspeex/high_lsp_tables.c
similarity index 100%
rename from apps/codecs/libspeex/high_lsp_tables.c
rename to lib/rbcodec/codecs/libspeex/high_lsp_tables.c
diff --git a/apps/codecs/libspeex/jitter.c b/lib/rbcodec/codecs/libspeex/jitter.c
similarity index 100%
rename from apps/codecs/libspeex/jitter.c
rename to lib/rbcodec/codecs/libspeex/jitter.c
diff --git a/apps/codecs/libspeex/kiss_fft.c b/lib/rbcodec/codecs/libspeex/kiss_fft.c
similarity index 100%
rename from apps/codecs/libspeex/kiss_fft.c
rename to lib/rbcodec/codecs/libspeex/kiss_fft.c
diff --git a/apps/codecs/libspeex/kiss_fft.h b/lib/rbcodec/codecs/libspeex/kiss_fft.h
similarity index 100%
rename from apps/codecs/libspeex/kiss_fft.h
rename to lib/rbcodec/codecs/libspeex/kiss_fft.h
diff --git a/apps/codecs/libspeex/kiss_fftr.c b/lib/rbcodec/codecs/libspeex/kiss_fftr.c
similarity index 100%
rename from apps/codecs/libspeex/kiss_fftr.c
rename to lib/rbcodec/codecs/libspeex/kiss_fftr.c
diff --git a/apps/codecs/libspeex/kiss_fftr.h b/lib/rbcodec/codecs/libspeex/kiss_fftr.h
similarity index 100%
rename from apps/codecs/libspeex/kiss_fftr.h
rename to lib/rbcodec/codecs/libspeex/kiss_fftr.h
diff --git a/apps/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make
similarity index 76%
rename from apps/codecs/libspeex/libspeex.make
rename to lib/rbcodec/codecs/libspeex/libspeex.make
index 1089982d27..6138dff4a9 100644
--- a/apps/codecs/libspeex/libspeex.make
+++ b/lib/rbcodec/codecs/libspeex/libspeex.make
@@ -15,7 +15,7 @@
 # some horrid typecasting
 _SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
 		-fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \
-		-I$(APPSDIR)/codecs/libspeex
+		-I$(RBCODECLIB_DIR)/codecs/libspeex
 
 # build voice codec with core -O switch
 VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
@@ -31,7 +31,7 @@ endif
 
 # libspeex
 SPEEXLIB := $(CODECDIR)/libspeex.a
-SPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)
+SPEEXLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspeex/SOURCES)
 SPEEXLIB_OBJ := $(call c2obj, $(SPEEXLIB_SRC))
 OTHER_SRC += $(SPEEXLIB_SRC)
 
@@ -41,26 +41,26 @@ $(SPEEXLIB): $(SPEEXLIB_OBJ)
 
 # libspeex-voice
 VOICESPEEXLIB := $(CODECDIR)/libspeex-voice.a
-VOICESPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)
-VOICESPEEXLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libspeex,$(BUILDDIR)/apps/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC))))
+VOICESPEEXLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspeex/SOURCES)
+VOICESPEEXLIB_OBJ := $(addsuffix .o,$(basename $(subst $(RBCODECLIB_DIR)/codecs/libspeex,$(RBCODEC_BLD)/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC))))
 
 $(VOICESPEEXLIB): $(VOICESPEEXLIB_OBJ)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 # pattern rules
 
-$(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.c
+$(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.S
+$(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c
+$(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.S
+$(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libspeex/lpc.c b/lib/rbcodec/codecs/libspeex/lpc.c
similarity index 100%
rename from apps/codecs/libspeex/lpc.c
rename to lib/rbcodec/codecs/libspeex/lpc.c
diff --git a/apps/codecs/libspeex/lpc.h b/lib/rbcodec/codecs/libspeex/lpc.h
similarity index 100%
rename from apps/codecs/libspeex/lpc.h
rename to lib/rbcodec/codecs/libspeex/lpc.h
diff --git a/apps/codecs/libspeex/lpc_bfin.h b/lib/rbcodec/codecs/libspeex/lpc_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/lpc_bfin.h
rename to lib/rbcodec/codecs/libspeex/lpc_bfin.h
diff --git a/apps/codecs/libspeex/lsp.c b/lib/rbcodec/codecs/libspeex/lsp.c
similarity index 100%
rename from apps/codecs/libspeex/lsp.c
rename to lib/rbcodec/codecs/libspeex/lsp.c
diff --git a/apps/codecs/libspeex/lsp.h b/lib/rbcodec/codecs/libspeex/lsp.h
similarity index 100%
rename from apps/codecs/libspeex/lsp.h
rename to lib/rbcodec/codecs/libspeex/lsp.h
diff --git a/apps/codecs/libspeex/lsp_bfin.h b/lib/rbcodec/codecs/libspeex/lsp_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/lsp_bfin.h
rename to lib/rbcodec/codecs/libspeex/lsp_bfin.h
diff --git a/apps/codecs/libspeex/lsp_tables_nb.c b/lib/rbcodec/codecs/libspeex/lsp_tables_nb.c
similarity index 100%
rename from apps/codecs/libspeex/lsp_tables_nb.c
rename to lib/rbcodec/codecs/libspeex/lsp_tables_nb.c
diff --git a/apps/codecs/libspeex/ltp.c b/lib/rbcodec/codecs/libspeex/ltp.c
similarity index 100%
rename from apps/codecs/libspeex/ltp.c
rename to lib/rbcodec/codecs/libspeex/ltp.c
diff --git a/apps/codecs/libspeex/ltp.h b/lib/rbcodec/codecs/libspeex/ltp.h
similarity index 100%
rename from apps/codecs/libspeex/ltp.h
rename to lib/rbcodec/codecs/libspeex/ltp.h
diff --git a/apps/codecs/libspeex/ltp_arm4.h b/lib/rbcodec/codecs/libspeex/ltp_arm4.h
similarity index 100%
rename from apps/codecs/libspeex/ltp_arm4.h
rename to lib/rbcodec/codecs/libspeex/ltp_arm4.h
diff --git a/apps/codecs/libspeex/ltp_bfin.h b/lib/rbcodec/codecs/libspeex/ltp_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/ltp_bfin.h
rename to lib/rbcodec/codecs/libspeex/ltp_bfin.h
diff --git a/apps/codecs/libspeex/ltp_cf.S b/lib/rbcodec/codecs/libspeex/ltp_cf.S
similarity index 100%
rename from apps/codecs/libspeex/ltp_cf.S
rename to lib/rbcodec/codecs/libspeex/ltp_cf.S
diff --git a/apps/codecs/libspeex/ltp_sse.h b/lib/rbcodec/codecs/libspeex/ltp_sse.h
similarity index 100%
rename from apps/codecs/libspeex/ltp_sse.h
rename to lib/rbcodec/codecs/libspeex/ltp_sse.h
diff --git a/apps/codecs/libspeex/math_approx.h b/lib/rbcodec/codecs/libspeex/math_approx.h
similarity index 100%
rename from apps/codecs/libspeex/math_approx.h
rename to lib/rbcodec/codecs/libspeex/math_approx.h
diff --git a/apps/codecs/libspeex/mdf.c b/lib/rbcodec/codecs/libspeex/mdf.c
similarity index 100%
rename from apps/codecs/libspeex/mdf.c
rename to lib/rbcodec/codecs/libspeex/mdf.c
diff --git a/apps/codecs/libspeex/misc_bfin.h b/lib/rbcodec/codecs/libspeex/misc_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/misc_bfin.h
rename to lib/rbcodec/codecs/libspeex/misc_bfin.h
diff --git a/apps/codecs/libspeex/modes.c b/lib/rbcodec/codecs/libspeex/modes.c
similarity index 100%
rename from apps/codecs/libspeex/modes.c
rename to lib/rbcodec/codecs/libspeex/modes.c
diff --git a/apps/codecs/libspeex/modes.h b/lib/rbcodec/codecs/libspeex/modes.h
similarity index 100%
rename from apps/codecs/libspeex/modes.h
rename to lib/rbcodec/codecs/libspeex/modes.h
diff --git a/apps/codecs/libspeex/modes_wb.c b/lib/rbcodec/codecs/libspeex/modes_wb.c
similarity index 100%
rename from apps/codecs/libspeex/modes_wb.c
rename to lib/rbcodec/codecs/libspeex/modes_wb.c
diff --git a/apps/codecs/libspeex/nb_celp.c b/lib/rbcodec/codecs/libspeex/nb_celp.c
similarity index 100%
rename from apps/codecs/libspeex/nb_celp.c
rename to lib/rbcodec/codecs/libspeex/nb_celp.c
diff --git a/apps/codecs/libspeex/nb_celp.h b/lib/rbcodec/codecs/libspeex/nb_celp.h
similarity index 100%
rename from apps/codecs/libspeex/nb_celp.h
rename to lib/rbcodec/codecs/libspeex/nb_celp.h
diff --git a/apps/codecs/libspeex/oggframing.c b/lib/rbcodec/codecs/libspeex/oggframing.c
similarity index 100%
rename from apps/codecs/libspeex/oggframing.c
rename to lib/rbcodec/codecs/libspeex/oggframing.c
diff --git a/apps/codecs/libspeex/os_support.h b/lib/rbcodec/codecs/libspeex/os_support.h
similarity index 100%
rename from apps/codecs/libspeex/os_support.h
rename to lib/rbcodec/codecs/libspeex/os_support.h
diff --git a/apps/codecs/libspeex/preprocess.c b/lib/rbcodec/codecs/libspeex/preprocess.c
similarity index 100%
rename from apps/codecs/libspeex/preprocess.c
rename to lib/rbcodec/codecs/libspeex/preprocess.c
diff --git a/apps/codecs/libspeex/pseudofloat.h b/lib/rbcodec/codecs/libspeex/pseudofloat.h
similarity index 100%
rename from apps/codecs/libspeex/pseudofloat.h
rename to lib/rbcodec/codecs/libspeex/pseudofloat.h
diff --git a/apps/codecs/libspeex/quant_lsp.c b/lib/rbcodec/codecs/libspeex/quant_lsp.c
similarity index 100%
rename from apps/codecs/libspeex/quant_lsp.c
rename to lib/rbcodec/codecs/libspeex/quant_lsp.c
diff --git a/apps/codecs/libspeex/quant_lsp.h b/lib/rbcodec/codecs/libspeex/quant_lsp.h
similarity index 100%
rename from apps/codecs/libspeex/quant_lsp.h
rename to lib/rbcodec/codecs/libspeex/quant_lsp.h
diff --git a/apps/codecs/libspeex/quant_lsp_bfin.h b/lib/rbcodec/codecs/libspeex/quant_lsp_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/quant_lsp_bfin.h
rename to lib/rbcodec/codecs/libspeex/quant_lsp_bfin.h
diff --git a/apps/codecs/libspeex/resample.c b/lib/rbcodec/codecs/libspeex/resample.c
similarity index 100%
rename from apps/codecs/libspeex/resample.c
rename to lib/rbcodec/codecs/libspeex/resample.c
diff --git a/apps/codecs/libspeex/rockbox.h b/lib/rbcodec/codecs/libspeex/rockbox.h
similarity index 100%
rename from apps/codecs/libspeex/rockbox.h
rename to lib/rbcodec/codecs/libspeex/rockbox.h
diff --git a/apps/codecs/libspeex/sb_celp.c b/lib/rbcodec/codecs/libspeex/sb_celp.c
similarity index 100%
rename from apps/codecs/libspeex/sb_celp.c
rename to lib/rbcodec/codecs/libspeex/sb_celp.c
diff --git a/apps/codecs/libspeex/sb_celp.h b/lib/rbcodec/codecs/libspeex/sb_celp.h
similarity index 100%
rename from apps/codecs/libspeex/sb_celp.h
rename to lib/rbcodec/codecs/libspeex/sb_celp.h
diff --git a/apps/codecs/libspeex/smallft.c b/lib/rbcodec/codecs/libspeex/smallft.c
similarity index 100%
rename from apps/codecs/libspeex/smallft.c
rename to lib/rbcodec/codecs/libspeex/smallft.c
diff --git a/apps/codecs/libspeex/smallft.h b/lib/rbcodec/codecs/libspeex/smallft.h
similarity index 100%
rename from apps/codecs/libspeex/smallft.h
rename to lib/rbcodec/codecs/libspeex/smallft.h
diff --git a/apps/codecs/libspeex/speex.c b/lib/rbcodec/codecs/libspeex/speex.c
similarity index 100%
rename from apps/codecs/libspeex/speex.c
rename to lib/rbcodec/codecs/libspeex/speex.c
diff --git a/apps/codecs/libspeex/speex/ogg.h b/lib/rbcodec/codecs/libspeex/speex/ogg.h
similarity index 100%
rename from apps/codecs/libspeex/speex/ogg.h
rename to lib/rbcodec/codecs/libspeex/speex/ogg.h
diff --git a/apps/codecs/libspeex/speex/speex.h b/lib/rbcodec/codecs/libspeex/speex/speex.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex.h
rename to lib/rbcodec/codecs/libspeex/speex/speex.h
diff --git a/apps/codecs/libspeex/speex/speex_bits.h b/lib/rbcodec/codecs/libspeex/speex/speex_bits.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_bits.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_bits.h
diff --git a/apps/codecs/libspeex/speex/speex_callbacks.h b/lib/rbcodec/codecs/libspeex/speex/speex_callbacks.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_callbacks.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_callbacks.h
diff --git a/apps/codecs/libspeex/speex/speex_config_types.h b/lib/rbcodec/codecs/libspeex/speex/speex_config_types.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_config_types.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_config_types.h
diff --git a/apps/codecs/libspeex/speex/speex_echo.h b/lib/rbcodec/codecs/libspeex/speex/speex_echo.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_echo.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_echo.h
diff --git a/apps/codecs/libspeex/speex/speex_header.h b/lib/rbcodec/codecs/libspeex/speex/speex_header.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_header.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_header.h
diff --git a/apps/codecs/libspeex/speex/speex_jitter.h b/lib/rbcodec/codecs/libspeex/speex/speex_jitter.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_jitter.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_jitter.h
diff --git a/apps/codecs/libspeex/speex/speex_preprocess.h b/lib/rbcodec/codecs/libspeex/speex/speex_preprocess.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_preprocess.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_preprocess.h
diff --git a/apps/codecs/libspeex/speex/speex_resampler.h b/lib/rbcodec/codecs/libspeex/speex/speex_resampler.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_resampler.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_resampler.h
diff --git a/apps/codecs/libspeex/speex/speex_stereo.h b/lib/rbcodec/codecs/libspeex/speex/speex_stereo.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_stereo.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_stereo.h
diff --git a/apps/codecs/libspeex/speex/speex_types.h b/lib/rbcodec/codecs/libspeex/speex/speex_types.h
similarity index 100%
rename from apps/codecs/libspeex/speex/speex_types.h
rename to lib/rbcodec/codecs/libspeex/speex/speex_types.h
diff --git a/apps/codecs/libspeex/speex_callbacks.c b/lib/rbcodec/codecs/libspeex/speex_callbacks.c
similarity index 100%
rename from apps/codecs/libspeex/speex_callbacks.c
rename to lib/rbcodec/codecs/libspeex/speex_callbacks.c
diff --git a/apps/codecs/libspeex/speex_header.c b/lib/rbcodec/codecs/libspeex/speex_header.c
similarity index 100%
rename from apps/codecs/libspeex/speex_header.c
rename to lib/rbcodec/codecs/libspeex/speex_header.c
diff --git a/apps/codecs/libspeex/stack_alloc.h b/lib/rbcodec/codecs/libspeex/stack_alloc.h
similarity index 100%
rename from apps/codecs/libspeex/stack_alloc.h
rename to lib/rbcodec/codecs/libspeex/stack_alloc.h
diff --git a/apps/codecs/libspeex/stereo.c b/lib/rbcodec/codecs/libspeex/stereo.c
similarity index 100%
rename from apps/codecs/libspeex/stereo.c
rename to lib/rbcodec/codecs/libspeex/stereo.c
diff --git a/apps/codecs/libspeex/vbr.c b/lib/rbcodec/codecs/libspeex/vbr.c
similarity index 100%
rename from apps/codecs/libspeex/vbr.c
rename to lib/rbcodec/codecs/libspeex/vbr.c
diff --git a/apps/codecs/libspeex/vbr.h b/lib/rbcodec/codecs/libspeex/vbr.h
similarity index 100%
rename from apps/codecs/libspeex/vbr.h
rename to lib/rbcodec/codecs/libspeex/vbr.h
diff --git a/apps/codecs/libspeex/vorbis_psy.c b/lib/rbcodec/codecs/libspeex/vorbis_psy.c
similarity index 100%
rename from apps/codecs/libspeex/vorbis_psy.c
rename to lib/rbcodec/codecs/libspeex/vorbis_psy.c
diff --git a/apps/codecs/libspeex/vorbis_psy.h b/lib/rbcodec/codecs/libspeex/vorbis_psy.h
similarity index 100%
rename from apps/codecs/libspeex/vorbis_psy.h
rename to lib/rbcodec/codecs/libspeex/vorbis_psy.h
diff --git a/apps/codecs/libspeex/vq.c b/lib/rbcodec/codecs/libspeex/vq.c
similarity index 100%
rename from apps/codecs/libspeex/vq.c
rename to lib/rbcodec/codecs/libspeex/vq.c
diff --git a/apps/codecs/libspeex/vq.h b/lib/rbcodec/codecs/libspeex/vq.h
similarity index 100%
rename from apps/codecs/libspeex/vq.h
rename to lib/rbcodec/codecs/libspeex/vq.h
diff --git a/apps/codecs/libspeex/vq_arm4.h b/lib/rbcodec/codecs/libspeex/vq_arm4.h
similarity index 100%
rename from apps/codecs/libspeex/vq_arm4.h
rename to lib/rbcodec/codecs/libspeex/vq_arm4.h
diff --git a/apps/codecs/libspeex/vq_bfin.h b/lib/rbcodec/codecs/libspeex/vq_bfin.h
similarity index 100%
rename from apps/codecs/libspeex/vq_bfin.h
rename to lib/rbcodec/codecs/libspeex/vq_bfin.h
diff --git a/apps/codecs/libspeex/vq_sse.h b/lib/rbcodec/codecs/libspeex/vq_sse.h
similarity index 100%
rename from apps/codecs/libspeex/vq_sse.h
rename to lib/rbcodec/codecs/libspeex/vq_sse.h
diff --git a/apps/codecs/libspeex/window.c b/lib/rbcodec/codecs/libspeex/window.c
similarity index 100%
rename from apps/codecs/libspeex/window.c
rename to lib/rbcodec/codecs/libspeex/window.c
diff --git a/apps/codecs/libtremor/CHANGELOG b/lib/rbcodec/codecs/libtremor/CHANGELOG
similarity index 100%
rename from apps/codecs/libtremor/CHANGELOG
rename to lib/rbcodec/codecs/libtremor/CHANGELOG
diff --git a/apps/codecs/libtremor/COPYING b/lib/rbcodec/codecs/libtremor/COPYING
similarity index 100%
rename from apps/codecs/libtremor/COPYING
rename to lib/rbcodec/codecs/libtremor/COPYING
diff --git a/apps/codecs/libtremor/README b/lib/rbcodec/codecs/libtremor/README
similarity index 100%
rename from apps/codecs/libtremor/README
rename to lib/rbcodec/codecs/libtremor/README
diff --git a/apps/codecs/libtremor/README.rockbox b/lib/rbcodec/codecs/libtremor/README.rockbox
similarity index 100%
rename from apps/codecs/libtremor/README.rockbox
rename to lib/rbcodec/codecs/libtremor/README.rockbox
diff --git a/apps/codecs/libtremor/SOURCES b/lib/rbcodec/codecs/libtremor/SOURCES
similarity index 100%
rename from apps/codecs/libtremor/SOURCES
rename to lib/rbcodec/codecs/libtremor/SOURCES
diff --git a/apps/codecs/libtremor/asm_arm.h b/lib/rbcodec/codecs/libtremor/asm_arm.h
similarity index 100%
rename from apps/codecs/libtremor/asm_arm.h
rename to lib/rbcodec/codecs/libtremor/asm_arm.h
diff --git a/apps/codecs/libtremor/asm_mcf5249.h b/lib/rbcodec/codecs/libtremor/asm_mcf5249.h
similarity index 100%
rename from apps/codecs/libtremor/asm_mcf5249.h
rename to lib/rbcodec/codecs/libtremor/asm_mcf5249.h
diff --git a/apps/codecs/libtremor/backends.h b/lib/rbcodec/codecs/libtremor/backends.h
similarity index 100%
rename from apps/codecs/libtremor/backends.h
rename to lib/rbcodec/codecs/libtremor/backends.h
diff --git a/apps/codecs/libtremor/bitwise.c b/lib/rbcodec/codecs/libtremor/bitwise.c
similarity index 100%
rename from apps/codecs/libtremor/bitwise.c
rename to lib/rbcodec/codecs/libtremor/bitwise.c
diff --git a/apps/codecs/libtremor/block.c b/lib/rbcodec/codecs/libtremor/block.c
similarity index 100%
rename from apps/codecs/libtremor/block.c
rename to lib/rbcodec/codecs/libtremor/block.c
diff --git a/apps/codecs/libtremor/codebook.c b/lib/rbcodec/codecs/libtremor/codebook.c
similarity index 100%
rename from apps/codecs/libtremor/codebook.c
rename to lib/rbcodec/codecs/libtremor/codebook.c
diff --git a/apps/codecs/libtremor/codebook.h b/lib/rbcodec/codecs/libtremor/codebook.h
similarity index 100%
rename from apps/codecs/libtremor/codebook.h
rename to lib/rbcodec/codecs/libtremor/codebook.h
diff --git a/apps/codecs/libtremor/codec_internal.h b/lib/rbcodec/codecs/libtremor/codec_internal.h
similarity index 100%
rename from apps/codecs/libtremor/codec_internal.h
rename to lib/rbcodec/codecs/libtremor/codec_internal.h
diff --git a/apps/codecs/libtremor/config-tremor.h b/lib/rbcodec/codecs/libtremor/config-tremor.h
similarity index 100%
rename from apps/codecs/libtremor/config-tremor.h
rename to lib/rbcodec/codecs/libtremor/config-tremor.h
diff --git a/apps/codecs/libtremor/config_types.h b/lib/rbcodec/codecs/libtremor/config_types.h
similarity index 100%
rename from apps/codecs/libtremor/config_types.h
rename to lib/rbcodec/codecs/libtremor/config_types.h
diff --git a/apps/codecs/libtremor/ctype.c b/lib/rbcodec/codecs/libtremor/ctype.c
similarity index 100%
rename from apps/codecs/libtremor/ctype.c
rename to lib/rbcodec/codecs/libtremor/ctype.c
diff --git a/apps/codecs/libtremor/ffmpeg_stuff.h b/lib/rbcodec/codecs/libtremor/ffmpeg_stuff.h
similarity index 100%
rename from apps/codecs/libtremor/ffmpeg_stuff.h
rename to lib/rbcodec/codecs/libtremor/ffmpeg_stuff.h
diff --git a/apps/codecs/libtremor/floor0.c b/lib/rbcodec/codecs/libtremor/floor0.c
similarity index 100%
rename from apps/codecs/libtremor/floor0.c
rename to lib/rbcodec/codecs/libtremor/floor0.c
diff --git a/apps/codecs/libtremor/floor1.c b/lib/rbcodec/codecs/libtremor/floor1.c
similarity index 100%
rename from apps/codecs/libtremor/floor1.c
rename to lib/rbcodec/codecs/libtremor/floor1.c
diff --git a/apps/codecs/libtremor/framing.c b/lib/rbcodec/codecs/libtremor/framing.c
similarity index 100%
rename from apps/codecs/libtremor/framing.c
rename to lib/rbcodec/codecs/libtremor/framing.c
diff --git a/apps/codecs/libtremor/info.c b/lib/rbcodec/codecs/libtremor/info.c
similarity index 100%
rename from apps/codecs/libtremor/info.c
rename to lib/rbcodec/codecs/libtremor/info.c
diff --git a/apps/codecs/libtremor/ivorbiscodec.h b/lib/rbcodec/codecs/libtremor/ivorbiscodec.h
similarity index 100%
rename from apps/codecs/libtremor/ivorbiscodec.h
rename to lib/rbcodec/codecs/libtremor/ivorbiscodec.h
diff --git a/apps/codecs/libtremor/ivorbisfile.h b/lib/rbcodec/codecs/libtremor/ivorbisfile.h
similarity index 100%
rename from apps/codecs/libtremor/ivorbisfile.h
rename to lib/rbcodec/codecs/libtremor/ivorbisfile.h
diff --git a/apps/codecs/libtremor/libtremor.make b/lib/rbcodec/codecs/libtremor/libtremor.make
similarity index 88%
rename from apps/codecs/libtremor/libtremor.make
rename to lib/rbcodec/codecs/libtremor/libtremor.make
index 586c703346..4a581508b0 100644
--- a/apps/codecs/libtremor/libtremor.make
+++ b/lib/rbcodec/codecs/libtremor/libtremor.make
@@ -9,7 +9,7 @@
 
 # libtremor
 TREMORLIB := $(CODECDIR)/libtremor.a
-TREMORLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libtremor/SOURCES)
+TREMORLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libtremor/SOURCES)
 TREMORLIB_OBJ := $(call c2obj, $(TREMORLIB_SRC))
 OTHER_SRC += $(TREMORLIB_SRC)
 
diff --git a/apps/codecs/libtremor/lsp_lookup.h b/lib/rbcodec/codecs/libtremor/lsp_lookup.h
similarity index 100%
rename from apps/codecs/libtremor/lsp_lookup.h
rename to lib/rbcodec/codecs/libtremor/lsp_lookup.h
diff --git a/apps/codecs/libtremor/mapping0.c b/lib/rbcodec/codecs/libtremor/mapping0.c
similarity index 100%
rename from apps/codecs/libtremor/mapping0.c
rename to lib/rbcodec/codecs/libtremor/mapping0.c
diff --git a/apps/codecs/libtremor/misc.h b/lib/rbcodec/codecs/libtremor/misc.h
similarity index 100%
rename from apps/codecs/libtremor/misc.h
rename to lib/rbcodec/codecs/libtremor/misc.h
diff --git a/apps/codecs/libtremor/ogg.h b/lib/rbcodec/codecs/libtremor/ogg.h
similarity index 100%
rename from apps/codecs/libtremor/ogg.h
rename to lib/rbcodec/codecs/libtremor/ogg.h
diff --git a/apps/codecs/libtremor/oggmalloc.c b/lib/rbcodec/codecs/libtremor/oggmalloc.c
similarity index 100%
rename from apps/codecs/libtremor/oggmalloc.c
rename to lib/rbcodec/codecs/libtremor/oggmalloc.c
diff --git a/apps/codecs/libtremor/os.h b/lib/rbcodec/codecs/libtremor/os.h
similarity index 100%
rename from apps/codecs/libtremor/os.h
rename to lib/rbcodec/codecs/libtremor/os.h
diff --git a/apps/codecs/libtremor/os_types.h b/lib/rbcodec/codecs/libtremor/os_types.h
similarity index 100%
rename from apps/codecs/libtremor/os_types.h
rename to lib/rbcodec/codecs/libtremor/os_types.h
diff --git a/apps/codecs/libtremor/registry.c b/lib/rbcodec/codecs/libtremor/registry.c
similarity index 100%
rename from apps/codecs/libtremor/registry.c
rename to lib/rbcodec/codecs/libtremor/registry.c
diff --git a/apps/codecs/libtremor/registry.h b/lib/rbcodec/codecs/libtremor/registry.h
similarity index 100%
rename from apps/codecs/libtremor/registry.h
rename to lib/rbcodec/codecs/libtremor/registry.h
diff --git a/apps/codecs/libtremor/res012.c b/lib/rbcodec/codecs/libtremor/res012.c
similarity index 100%
rename from apps/codecs/libtremor/res012.c
rename to lib/rbcodec/codecs/libtremor/res012.c
diff --git a/apps/codecs/libtremor/sharedbook.c b/lib/rbcodec/codecs/libtremor/sharedbook.c
similarity index 100%
rename from apps/codecs/libtremor/sharedbook.c
rename to lib/rbcodec/codecs/libtremor/sharedbook.c
diff --git a/apps/codecs/libtremor/synthesis.c b/lib/rbcodec/codecs/libtremor/synthesis.c
similarity index 100%
rename from apps/codecs/libtremor/synthesis.c
rename to lib/rbcodec/codecs/libtremor/synthesis.c
diff --git a/apps/codecs/libtremor/vorbisfile.c b/lib/rbcodec/codecs/libtremor/vorbisfile.c
similarity index 100%
rename from apps/codecs/libtremor/vorbisfile.c
rename to lib/rbcodec/codecs/libtremor/vorbisfile.c
diff --git a/apps/codecs/libtremor/window.c b/lib/rbcodec/codecs/libtremor/window.c
similarity index 100%
rename from apps/codecs/libtremor/window.c
rename to lib/rbcodec/codecs/libtremor/window.c
diff --git a/apps/codecs/libtremor/window.h b/lib/rbcodec/codecs/libtremor/window.h
similarity index 100%
rename from apps/codecs/libtremor/window.h
rename to lib/rbcodec/codecs/libtremor/window.h
diff --git a/apps/codecs/libtremor/window_lookup.h b/lib/rbcodec/codecs/libtremor/window_lookup.h
similarity index 100%
rename from apps/codecs/libtremor/window_lookup.h
rename to lib/rbcodec/codecs/libtremor/window_lookup.h
diff --git a/apps/codecs/libtta/README b/lib/rbcodec/codecs/libtta/README
similarity index 100%
rename from apps/codecs/libtta/README
rename to lib/rbcodec/codecs/libtta/README
diff --git a/apps/codecs/libtta/README.rockbox b/lib/rbcodec/codecs/libtta/README.rockbox
similarity index 100%
rename from apps/codecs/libtta/README.rockbox
rename to lib/rbcodec/codecs/libtta/README.rockbox
diff --git a/apps/codecs/libtta/SOURCES b/lib/rbcodec/codecs/libtta/SOURCES
similarity index 100%
rename from apps/codecs/libtta/SOURCES
rename to lib/rbcodec/codecs/libtta/SOURCES
diff --git a/apps/codecs/libtta/filter.h b/lib/rbcodec/codecs/libtta/filter.h
similarity index 100%
rename from apps/codecs/libtta/filter.h
rename to lib/rbcodec/codecs/libtta/filter.h
diff --git a/apps/codecs/libtta/filter_arm.S b/lib/rbcodec/codecs/libtta/filter_arm.S
similarity index 100%
rename from apps/codecs/libtta/filter_arm.S
rename to lib/rbcodec/codecs/libtta/filter_arm.S
diff --git a/apps/codecs/libtta/filter_coldfire.S b/lib/rbcodec/codecs/libtta/filter_coldfire.S
similarity index 100%
rename from apps/codecs/libtta/filter_coldfire.S
rename to lib/rbcodec/codecs/libtta/filter_coldfire.S
diff --git a/apps/codecs/libtta/libtta.make b/lib/rbcodec/codecs/libtta/libtta.make
similarity index 89%
rename from apps/codecs/libtta/libtta.make
rename to lib/rbcodec/codecs/libtta/libtta.make
index f8b7c650b2..3fe3db1989 100644
--- a/apps/codecs/libtta/libtta.make
+++ b/lib/rbcodec/codecs/libtta/libtta.make
@@ -9,7 +9,7 @@
 
 # libtta
 TTALIB := $(CODECDIR)/libtta.a
-TTALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libtta/SOURCES)
+TTALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libtta/SOURCES)
 TTALIB_OBJ := $(call c2obj, $(TTALIB_SRC))
 OTHER_SRC += $(TTALIB_SRC)
 
diff --git a/apps/codecs/libtta/ttadec.c b/lib/rbcodec/codecs/libtta/ttadec.c
similarity index 100%
rename from apps/codecs/libtta/ttadec.c
rename to lib/rbcodec/codecs/libtta/ttadec.c
diff --git a/apps/codecs/libtta/ttadec.h b/lib/rbcodec/codecs/libtta/ttadec.h
similarity index 100%
rename from apps/codecs/libtta/ttadec.h
rename to lib/rbcodec/codecs/libtta/ttadec.h
diff --git a/apps/codecs/libtta/ttalib.h b/lib/rbcodec/codecs/libtta/ttalib.h
similarity index 100%
rename from apps/codecs/libtta/ttalib.h
rename to lib/rbcodec/codecs/libtta/ttalib.h
diff --git a/apps/codecs/libwavpack/LICENSE b/lib/rbcodec/codecs/libwavpack/LICENSE
similarity index 100%
rename from apps/codecs/libwavpack/LICENSE
rename to lib/rbcodec/codecs/libwavpack/LICENSE
diff --git a/apps/codecs/libwavpack/README b/lib/rbcodec/codecs/libwavpack/README
similarity index 100%
rename from apps/codecs/libwavpack/README
rename to lib/rbcodec/codecs/libwavpack/README
diff --git a/apps/codecs/libwavpack/README.rockbox b/lib/rbcodec/codecs/libwavpack/README.rockbox
similarity index 100%
rename from apps/codecs/libwavpack/README.rockbox
rename to lib/rbcodec/codecs/libwavpack/README.rockbox
diff --git a/apps/codecs/libwavpack/SOURCES b/lib/rbcodec/codecs/libwavpack/SOURCES
similarity index 100%
rename from apps/codecs/libwavpack/SOURCES
rename to lib/rbcodec/codecs/libwavpack/SOURCES
diff --git a/apps/codecs/libwavpack/arm.S b/lib/rbcodec/codecs/libwavpack/arm.S
similarity index 100%
rename from apps/codecs/libwavpack/arm.S
rename to lib/rbcodec/codecs/libwavpack/arm.S
diff --git a/apps/codecs/libwavpack/arml.S b/lib/rbcodec/codecs/libwavpack/arml.S
similarity index 100%
rename from apps/codecs/libwavpack/arml.S
rename to lib/rbcodec/codecs/libwavpack/arml.S
diff --git a/apps/codecs/libwavpack/bits.c b/lib/rbcodec/codecs/libwavpack/bits.c
similarity index 100%
rename from apps/codecs/libwavpack/bits.c
rename to lib/rbcodec/codecs/libwavpack/bits.c
diff --git a/apps/codecs/libwavpack/coldfire.S b/lib/rbcodec/codecs/libwavpack/coldfire.S
similarity index 100%
rename from apps/codecs/libwavpack/coldfire.S
rename to lib/rbcodec/codecs/libwavpack/coldfire.S
diff --git a/apps/codecs/libwavpack/float.c b/lib/rbcodec/codecs/libwavpack/float.c
similarity index 100%
rename from apps/codecs/libwavpack/float.c
rename to lib/rbcodec/codecs/libwavpack/float.c
diff --git a/apps/codecs/libwavpack/libwavpack.make b/lib/rbcodec/codecs/libwavpack/libwavpack.make
similarity index 88%
rename from apps/codecs/libwavpack/libwavpack.make
rename to lib/rbcodec/codecs/libwavpack/libwavpack.make
index a2e5377418..27a2d214a1 100644
--- a/apps/codecs/libwavpack/libwavpack.make
+++ b/lib/rbcodec/codecs/libwavpack/libwavpack.make
@@ -9,7 +9,7 @@
 
 # libwavpack
 WAVPACKLIB := $(CODECDIR)/libwavpack.a
-WAVPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwavpack/SOURCES)
+WAVPACKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwavpack/SOURCES)
 WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC))
 OTHER_SRC += $(WAVPACKLIB_SRC)
 
diff --git a/apps/codecs/libwavpack/make.bat b/lib/rbcodec/codecs/libwavpack/make.bat
similarity index 100%
rename from apps/codecs/libwavpack/make.bat
rename to lib/rbcodec/codecs/libwavpack/make.bat
diff --git a/apps/codecs/libwavpack/metadata.c b/lib/rbcodec/codecs/libwavpack/metadata.c
similarity index 100%
rename from apps/codecs/libwavpack/metadata.c
rename to lib/rbcodec/codecs/libwavpack/metadata.c
diff --git a/apps/codecs/libwavpack/pack.c b/lib/rbcodec/codecs/libwavpack/pack.c
similarity index 100%
rename from apps/codecs/libwavpack/pack.c
rename to lib/rbcodec/codecs/libwavpack/pack.c
diff --git a/apps/codecs/libwavpack/unpack.c b/lib/rbcodec/codecs/libwavpack/unpack.c
similarity index 100%
rename from apps/codecs/libwavpack/unpack.c
rename to lib/rbcodec/codecs/libwavpack/unpack.c
diff --git a/apps/codecs/libwavpack/wavpack.h b/lib/rbcodec/codecs/libwavpack/wavpack.h
similarity index 100%
rename from apps/codecs/libwavpack/wavpack.h
rename to lib/rbcodec/codecs/libwavpack/wavpack.h
diff --git a/apps/codecs/libwavpack/words.c b/lib/rbcodec/codecs/libwavpack/words.c
similarity index 100%
rename from apps/codecs/libwavpack/words.c
rename to lib/rbcodec/codecs/libwavpack/words.c
diff --git a/apps/codecs/libwavpack/wputils.c b/lib/rbcodec/codecs/libwavpack/wputils.c
similarity index 100%
rename from apps/codecs/libwavpack/wputils.c
rename to lib/rbcodec/codecs/libwavpack/wputils.c
diff --git a/apps/codecs/libwma/SOURCES b/lib/rbcodec/codecs/libwma/SOURCES
similarity index 100%
rename from apps/codecs/libwma/SOURCES
rename to lib/rbcodec/codecs/libwma/SOURCES
diff --git a/apps/codecs/libwma/libwma.make b/lib/rbcodec/codecs/libwma/libwma.make
similarity index 89%
rename from apps/codecs/libwma/libwma.make
rename to lib/rbcodec/codecs/libwma/libwma.make
index 71c4cdc626..a916a4f90f 100644
--- a/apps/codecs/libwma/libwma.make
+++ b/lib/rbcodec/codecs/libwma/libwma.make
@@ -9,7 +9,7 @@
 
 # libwma
 WMALIB := $(CODECDIR)/libwma.a
-WMALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwma/SOURCES)
+WMALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwma/SOURCES)
 WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC))
 OTHER_SRC += $(WMALIB_SRC)
 
diff --git a/apps/codecs/libwma/types.h b/lib/rbcodec/codecs/libwma/types.h
similarity index 100%
rename from apps/codecs/libwma/types.h
rename to lib/rbcodec/codecs/libwma/types.h
diff --git a/apps/codecs/libwma/wmadata.h b/lib/rbcodec/codecs/libwma/wmadata.h
similarity index 100%
rename from apps/codecs/libwma/wmadata.h
rename to lib/rbcodec/codecs/libwma/wmadata.h
diff --git a/apps/codecs/libwma/wmadec.h b/lib/rbcodec/codecs/libwma/wmadec.h
similarity index 100%
rename from apps/codecs/libwma/wmadec.h
rename to lib/rbcodec/codecs/libwma/wmadec.h
diff --git a/apps/codecs/libwma/wmadeci.c b/lib/rbcodec/codecs/libwma/wmadeci.c
similarity index 100%
rename from apps/codecs/libwma/wmadeci.c
rename to lib/rbcodec/codecs/libwma/wmadeci.c
diff --git a/apps/codecs/libwma/wmafixed.c b/lib/rbcodec/codecs/libwma/wmafixed.c
similarity index 100%
rename from apps/codecs/libwma/wmafixed.c
rename to lib/rbcodec/codecs/libwma/wmafixed.c
diff --git a/apps/codecs/libwma/wmafixed.h b/lib/rbcodec/codecs/libwma/wmafixed.h
similarity index 100%
rename from apps/codecs/libwma/wmafixed.h
rename to lib/rbcodec/codecs/libwma/wmafixed.h
diff --git a/apps/codecs/libwmapro/README.rockbox b/lib/rbcodec/codecs/libwmapro/README.rockbox
similarity index 100%
rename from apps/codecs/libwmapro/README.rockbox
rename to lib/rbcodec/codecs/libwmapro/README.rockbox
diff --git a/apps/codecs/libwmapro/SOURCES b/lib/rbcodec/codecs/libwmapro/SOURCES
similarity index 100%
rename from apps/codecs/libwmapro/SOURCES
rename to lib/rbcodec/codecs/libwmapro/SOURCES
diff --git a/apps/codecs/libwmapro/libwmapro.make b/lib/rbcodec/codecs/libwmapro/libwmapro.make
similarity index 88%
rename from apps/codecs/libwmapro/libwmapro.make
rename to lib/rbcodec/codecs/libwmapro/libwmapro.make
index 9177eafb20..3db9000b43 100644
--- a/apps/codecs/libwmapro/libwmapro.make
+++ b/lib/rbcodec/codecs/libwmapro/libwmapro.make
@@ -9,7 +9,7 @@
 
 # libwmapro
 WMAPROLIB := $(CODECDIR)/libwmapro.a
-WMAPROLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwmapro/SOURCES)
+WMAPROLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwmapro/SOURCES)
 WMAPROLIB_OBJ := $(call c2obj, $(WMAPROLIB_SRC))
 OTHER_SRC += $(WMAPROLIB_SRC)
 
diff --git a/apps/codecs/libwmapro/mdct_tables.c b/lib/rbcodec/codecs/libwmapro/mdct_tables.c
similarity index 100%
rename from apps/codecs/libwmapro/mdct_tables.c
rename to lib/rbcodec/codecs/libwmapro/mdct_tables.c
diff --git a/apps/codecs/libwmapro/mdct_tables.h b/lib/rbcodec/codecs/libwmapro/mdct_tables.h
similarity index 100%
rename from apps/codecs/libwmapro/mdct_tables.h
rename to lib/rbcodec/codecs/libwmapro/mdct_tables.h
diff --git a/apps/codecs/libwmapro/quant.h b/lib/rbcodec/codecs/libwmapro/quant.h
similarity index 100%
rename from apps/codecs/libwmapro/quant.h
rename to lib/rbcodec/codecs/libwmapro/quant.h
diff --git a/apps/codecs/libwmapro/wma.c b/lib/rbcodec/codecs/libwmapro/wma.c
similarity index 100%
rename from apps/codecs/libwmapro/wma.c
rename to lib/rbcodec/codecs/libwmapro/wma.c
diff --git a/apps/codecs/libwmapro/wma.h b/lib/rbcodec/codecs/libwmapro/wma.h
similarity index 100%
rename from apps/codecs/libwmapro/wma.h
rename to lib/rbcodec/codecs/libwmapro/wma.h
diff --git a/apps/codecs/libwmapro/wmapro_math.h b/lib/rbcodec/codecs/libwmapro/wmapro_math.h
similarity index 100%
rename from apps/codecs/libwmapro/wmapro_math.h
rename to lib/rbcodec/codecs/libwmapro/wmapro_math.h
diff --git a/apps/codecs/libwmapro/wmaprodata.h b/lib/rbcodec/codecs/libwmapro/wmaprodata.h
similarity index 100%
rename from apps/codecs/libwmapro/wmaprodata.h
rename to lib/rbcodec/codecs/libwmapro/wmaprodata.h
diff --git a/apps/codecs/libwmapro/wmaprodec.c b/lib/rbcodec/codecs/libwmapro/wmaprodec.c
similarity index 100%
rename from apps/codecs/libwmapro/wmaprodec.c
rename to lib/rbcodec/codecs/libwmapro/wmaprodec.c
diff --git a/apps/codecs/libwmapro/wmaprodec.h b/lib/rbcodec/codecs/libwmapro/wmaprodec.h
similarity index 100%
rename from apps/codecs/libwmapro/wmaprodec.h
rename to lib/rbcodec/codecs/libwmapro/wmaprodec.h
diff --git a/apps/codecs/libwmavoice/Makefile b/lib/rbcodec/codecs/libwmavoice/Makefile
similarity index 100%
rename from apps/codecs/libwmavoice/Makefile
rename to lib/rbcodec/codecs/libwmavoice/Makefile
diff --git a/apps/codecs/libwmavoice/README.rockbox b/lib/rbcodec/codecs/libwmavoice/README.rockbox
similarity index 100%
rename from apps/codecs/libwmavoice/README.rockbox
rename to lib/rbcodec/codecs/libwmavoice/README.rockbox
diff --git a/apps/codecs/libwmavoice/SOURCES b/lib/rbcodec/codecs/libwmavoice/SOURCES
similarity index 100%
rename from apps/codecs/libwmavoice/SOURCES
rename to lib/rbcodec/codecs/libwmavoice/SOURCES
diff --git a/apps/codecs/libwmavoice/acelp_filters.c b/lib/rbcodec/codecs/libwmavoice/acelp_filters.c
similarity index 100%
rename from apps/codecs/libwmavoice/acelp_filters.c
rename to lib/rbcodec/codecs/libwmavoice/acelp_filters.c
diff --git a/apps/codecs/libwmavoice/acelp_filters.h b/lib/rbcodec/codecs/libwmavoice/acelp_filters.h
similarity index 100%
rename from apps/codecs/libwmavoice/acelp_filters.h
rename to lib/rbcodec/codecs/libwmavoice/acelp_filters.h
diff --git a/apps/codecs/libwmavoice/acelp_vectors.c b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.c
similarity index 100%
rename from apps/codecs/libwmavoice/acelp_vectors.c
rename to lib/rbcodec/codecs/libwmavoice/acelp_vectors.c
diff --git a/apps/codecs/libwmavoice/acelp_vectors.h b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.h
similarity index 100%
rename from apps/codecs/libwmavoice/acelp_vectors.h
rename to lib/rbcodec/codecs/libwmavoice/acelp_vectors.h
diff --git a/apps/codecs/libwmavoice/avcodec.h b/lib/rbcodec/codecs/libwmavoice/avcodec.h
similarity index 100%
rename from apps/codecs/libwmavoice/avcodec.h
rename to lib/rbcodec/codecs/libwmavoice/avcodec.h
diff --git a/apps/codecs/libwmavoice/avfft.c b/lib/rbcodec/codecs/libwmavoice/avfft.c
similarity index 100%
rename from apps/codecs/libwmavoice/avfft.c
rename to lib/rbcodec/codecs/libwmavoice/avfft.c
diff --git a/apps/codecs/libwmavoice/avfft.h b/lib/rbcodec/codecs/libwmavoice/avfft.h
similarity index 100%
rename from apps/codecs/libwmavoice/avfft.h
rename to lib/rbcodec/codecs/libwmavoice/avfft.h
diff --git a/apps/codecs/libwmavoice/bitstream.c b/lib/rbcodec/codecs/libwmavoice/bitstream.c
similarity index 100%
rename from apps/codecs/libwmavoice/bitstream.c
rename to lib/rbcodec/codecs/libwmavoice/bitstream.c
diff --git a/apps/codecs/libwmavoice/celp_filters.c b/lib/rbcodec/codecs/libwmavoice/celp_filters.c
similarity index 100%
rename from apps/codecs/libwmavoice/celp_filters.c
rename to lib/rbcodec/codecs/libwmavoice/celp_filters.c
diff --git a/apps/codecs/libwmavoice/celp_filters.h b/lib/rbcodec/codecs/libwmavoice/celp_filters.h
similarity index 100%
rename from apps/codecs/libwmavoice/celp_filters.h
rename to lib/rbcodec/codecs/libwmavoice/celp_filters.h
diff --git a/apps/codecs/libwmavoice/celp_math.c b/lib/rbcodec/codecs/libwmavoice/celp_math.c
similarity index 100%
rename from apps/codecs/libwmavoice/celp_math.c
rename to lib/rbcodec/codecs/libwmavoice/celp_math.c
diff --git a/apps/codecs/libwmavoice/celp_math.h b/lib/rbcodec/codecs/libwmavoice/celp_math.h
similarity index 100%
rename from apps/codecs/libwmavoice/celp_math.h
rename to lib/rbcodec/codecs/libwmavoice/celp_math.h
diff --git a/apps/codecs/libwmavoice/dct.c b/lib/rbcodec/codecs/libwmavoice/dct.c
similarity index 100%
rename from apps/codecs/libwmavoice/dct.c
rename to lib/rbcodec/codecs/libwmavoice/dct.c
diff --git a/apps/codecs/libwmavoice/dct32.c b/lib/rbcodec/codecs/libwmavoice/dct32.c
similarity index 100%
rename from apps/codecs/libwmavoice/dct32.c
rename to lib/rbcodec/codecs/libwmavoice/dct32.c
diff --git a/apps/codecs/libwmavoice/fft.c b/lib/rbcodec/codecs/libwmavoice/fft.c
similarity index 100%
rename from apps/codecs/libwmavoice/fft.c
rename to lib/rbcodec/codecs/libwmavoice/fft.c
diff --git a/apps/codecs/libwmavoice/fft.h b/lib/rbcodec/codecs/libwmavoice/fft.h
similarity index 100%
rename from apps/codecs/libwmavoice/fft.h
rename to lib/rbcodec/codecs/libwmavoice/fft.h
diff --git a/apps/codecs/libwmavoice/get_bits.h b/lib/rbcodec/codecs/libwmavoice/get_bits.h
similarity index 100%
rename from apps/codecs/libwmavoice/get_bits.h
rename to lib/rbcodec/codecs/libwmavoice/get_bits.h
diff --git a/apps/codecs/libwmavoice/internal.h b/lib/rbcodec/codecs/libwmavoice/internal.h
similarity index 100%
rename from apps/codecs/libwmavoice/internal.h
rename to lib/rbcodec/codecs/libwmavoice/internal.h
diff --git a/apps/codecs/libwmavoice/libavutil/attributes.h b/lib/rbcodec/codecs/libwmavoice/libavutil/attributes.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/attributes.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/attributes.h
diff --git a/apps/codecs/libwmavoice/libavutil/avutil.h b/lib/rbcodec/codecs/libwmavoice/libavutil/avutil.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/avutil.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/avutil.h
diff --git a/apps/codecs/libwmavoice/libavutil/bswap.h b/lib/rbcodec/codecs/libwmavoice/libavutil/bswap.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/bswap.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/bswap.h
diff --git a/apps/codecs/libwmavoice/libavutil/common.h b/lib/rbcodec/codecs/libwmavoice/libavutil/common.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/common.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/common.h
diff --git a/apps/codecs/libwmavoice/libavutil/internal.h b/lib/rbcodec/codecs/libwmavoice/libavutil/internal.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/internal.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/internal.h
diff --git a/apps/codecs/libwmavoice/libavutil/intreadwrite.h b/lib/rbcodec/codecs/libwmavoice/libavutil/intreadwrite.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/intreadwrite.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/intreadwrite.h
diff --git a/apps/codecs/libwmavoice/libavutil/log.c b/lib/rbcodec/codecs/libwmavoice/libavutil/log.c
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/log.c
rename to lib/rbcodec/codecs/libwmavoice/libavutil/log.c
diff --git a/apps/codecs/libwmavoice/libavutil/log.h b/lib/rbcodec/codecs/libwmavoice/libavutil/log.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/log.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/log.h
diff --git a/apps/codecs/libwmavoice/libavutil/lzo.c b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.c
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/lzo.c
rename to lib/rbcodec/codecs/libwmavoice/libavutil/lzo.c
diff --git a/apps/codecs/libwmavoice/libavutil/lzo.h b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/lzo.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/lzo.h
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.c b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.c
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/mathematics.c
rename to lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.c
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.h b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/mathematics.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.h
diff --git a/apps/codecs/libwmavoice/libavutil/mem.c b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.c
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/mem.c
rename to lib/rbcodec/codecs/libwmavoice/libavutil/mem.c
diff --git a/apps/codecs/libwmavoice/libavutil/mem.h b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.h
similarity index 100%
rename from apps/codecs/libwmavoice/libavutil/mem.h
rename to lib/rbcodec/codecs/libwmavoice/libavutil/mem.h
diff --git a/apps/codecs/libwmavoice/libwmavoice.make b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
similarity index 86%
rename from apps/codecs/libwmavoice/libwmavoice.make
rename to lib/rbcodec/codecs/libwmavoice/libwmavoice.make
index b35756c64a..609e5612f8 100644
--- a/apps/codecs/libwmavoice/libwmavoice.make
+++ b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
@@ -9,7 +9,7 @@
 
 # libwmavoice
 WMAVOICELIB := $(CODECDIR)/libwmavoice.a
-WMAVOICELIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwmavoice/SOURCES)
+WMAVOICELIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwmavoice/SOURCES)
 WMAVOICELIB_OBJ := $(call c2obj, $(WMAVOICELIB_SRC))
 OTHER_SRC += $(WMAVOICELIB_SRC)
 
@@ -17,7 +17,7 @@ $(WMAVOICELIB): $(WMAVOICELIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-WMAVOICEFLAGS = -I$(APPSDIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS))
+WMAVOICEFLAGS = -I$(RBCODECLIB_DIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS))
 
 ifeq ($(ARCH),arch_m68k)
 	WMAVOICEFLAGS += -O2
diff --git a/apps/codecs/libwmavoice/lsp.c b/lib/rbcodec/codecs/libwmavoice/lsp.c
similarity index 100%
rename from apps/codecs/libwmavoice/lsp.c
rename to lib/rbcodec/codecs/libwmavoice/lsp.c
diff --git a/apps/codecs/libwmavoice/lsp.h b/lib/rbcodec/codecs/libwmavoice/lsp.h
similarity index 100%
rename from apps/codecs/libwmavoice/lsp.h
rename to lib/rbcodec/codecs/libwmavoice/lsp.h
diff --git a/apps/codecs/libwmavoice/mathops.h b/lib/rbcodec/codecs/libwmavoice/mathops.h
similarity index 100%
rename from apps/codecs/libwmavoice/mathops.h
rename to lib/rbcodec/codecs/libwmavoice/mathops.h
diff --git a/apps/codecs/libwmavoice/mdct.c b/lib/rbcodec/codecs/libwmavoice/mdct.c
similarity index 100%
rename from apps/codecs/libwmavoice/mdct.c
rename to lib/rbcodec/codecs/libwmavoice/mdct.c
diff --git a/apps/codecs/libwmavoice/mdct_tablegen.h b/lib/rbcodec/codecs/libwmavoice/mdct_tablegen.h
similarity index 100%
rename from apps/codecs/libwmavoice/mdct_tablegen.h
rename to lib/rbcodec/codecs/libwmavoice/mdct_tablegen.h
diff --git a/apps/codecs/libwmavoice/put_bits.h b/lib/rbcodec/codecs/libwmavoice/put_bits.h
similarity index 100%
rename from apps/codecs/libwmavoice/put_bits.h
rename to lib/rbcodec/codecs/libwmavoice/put_bits.h
diff --git a/apps/codecs/libwmavoice/rdft.c b/lib/rbcodec/codecs/libwmavoice/rdft.c
similarity index 100%
rename from apps/codecs/libwmavoice/rdft.c
rename to lib/rbcodec/codecs/libwmavoice/rdft.c
diff --git a/apps/codecs/libwmavoice/utils.c b/lib/rbcodec/codecs/libwmavoice/utils.c
similarity index 100%
rename from apps/codecs/libwmavoice/utils.c
rename to lib/rbcodec/codecs/libwmavoice/utils.c
diff --git a/apps/codecs/libwmavoice/wmavoice.c b/lib/rbcodec/codecs/libwmavoice/wmavoice.c
similarity index 100%
rename from apps/codecs/libwmavoice/wmavoice.c
rename to lib/rbcodec/codecs/libwmavoice/wmavoice.c
diff --git a/apps/codecs/libwmavoice/wmavoice.h b/lib/rbcodec/codecs/libwmavoice/wmavoice.h
similarity index 100%
rename from apps/codecs/libwmavoice/wmavoice.h
rename to lib/rbcodec/codecs/libwmavoice/wmavoice.h
diff --git a/apps/codecs/libwmavoice/wmavoice_data.h b/lib/rbcodec/codecs/libwmavoice/wmavoice_data.h
similarity index 100%
rename from apps/codecs/libwmavoice/wmavoice_data.h
rename to lib/rbcodec/codecs/libwmavoice/wmavoice_data.h
diff --git a/apps/codecs/libwmavoice/wmavoice_mainbuild.patch b/lib/rbcodec/codecs/libwmavoice/wmavoice_mainbuild.patch
similarity index 100%
rename from apps/codecs/libwmavoice/wmavoice_mainbuild.patch
rename to lib/rbcodec/codecs/libwmavoice/wmavoice_mainbuild.patch
diff --git a/apps/codecs/mod.c b/lib/rbcodec/codecs/mod.c
similarity index 100%
rename from apps/codecs/mod.c
rename to lib/rbcodec/codecs/mod.c
diff --git a/apps/codecs/mp3_enc.c b/lib/rbcodec/codecs/mp3_enc.c
similarity index 100%
rename from apps/codecs/mp3_enc.c
rename to lib/rbcodec/codecs/mp3_enc.c
diff --git a/apps/codecs/mpa.c b/lib/rbcodec/codecs/mpa.c
similarity index 100%
rename from apps/codecs/mpa.c
rename to lib/rbcodec/codecs/mpa.c
diff --git a/apps/codecs/mpc.c b/lib/rbcodec/codecs/mpc.c
similarity index 100%
rename from apps/codecs/mpc.c
rename to lib/rbcodec/codecs/mpc.c
diff --git a/apps/codecs/nsf.c b/lib/rbcodec/codecs/nsf.c
similarity index 100%
rename from apps/codecs/nsf.c
rename to lib/rbcodec/codecs/nsf.c
diff --git a/apps/codecs/raac.c b/lib/rbcodec/codecs/raac.c
similarity index 100%
rename from apps/codecs/raac.c
rename to lib/rbcodec/codecs/raac.c
diff --git a/apps/codecs/sgc.c b/lib/rbcodec/codecs/sgc.c
similarity index 100%
rename from apps/codecs/sgc.c
rename to lib/rbcodec/codecs/sgc.c
diff --git a/apps/codecs/shorten.c b/lib/rbcodec/codecs/shorten.c
similarity index 100%
rename from apps/codecs/shorten.c
rename to lib/rbcodec/codecs/shorten.c
diff --git a/apps/codecs/sid.c b/lib/rbcodec/codecs/sid.c
similarity index 100%
rename from apps/codecs/sid.c
rename to lib/rbcodec/codecs/sid.c
diff --git a/apps/codecs/smaf.c b/lib/rbcodec/codecs/smaf.c
similarity index 100%
rename from apps/codecs/smaf.c
rename to lib/rbcodec/codecs/smaf.c
diff --git a/apps/codecs/spc.c b/lib/rbcodec/codecs/spc.c
similarity index 100%
rename from apps/codecs/spc.c
rename to lib/rbcodec/codecs/spc.c
diff --git a/apps/codecs/speex.c b/lib/rbcodec/codecs/speex.c
similarity index 100%
rename from apps/codecs/speex.c
rename to lib/rbcodec/codecs/speex.c
diff --git a/apps/codecs/tta.c b/lib/rbcodec/codecs/tta.c
similarity index 100%
rename from apps/codecs/tta.c
rename to lib/rbcodec/codecs/tta.c
diff --git a/apps/codecs/vgm.c b/lib/rbcodec/codecs/vgm.c
similarity index 100%
rename from apps/codecs/vgm.c
rename to lib/rbcodec/codecs/vgm.c
diff --git a/apps/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c
similarity index 100%
rename from apps/codecs/vorbis.c
rename to lib/rbcodec/codecs/vorbis.c
diff --git a/apps/codecs/vox.c b/lib/rbcodec/codecs/vox.c
similarity index 100%
rename from apps/codecs/vox.c
rename to lib/rbcodec/codecs/vox.c
diff --git a/apps/codecs/wav.c b/lib/rbcodec/codecs/wav.c
similarity index 100%
rename from apps/codecs/wav.c
rename to lib/rbcodec/codecs/wav.c
diff --git a/apps/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c
similarity index 100%
rename from apps/codecs/wav64.c
rename to lib/rbcodec/codecs/wav64.c
diff --git a/apps/codecs/wav_enc.c b/lib/rbcodec/codecs/wav_enc.c
similarity index 100%
rename from apps/codecs/wav_enc.c
rename to lib/rbcodec/codecs/wav_enc.c
diff --git a/apps/codecs/wavpack.c b/lib/rbcodec/codecs/wavpack.c
similarity index 100%
rename from apps/codecs/wavpack.c
rename to lib/rbcodec/codecs/wavpack.c
diff --git a/apps/codecs/wavpack_enc.c b/lib/rbcodec/codecs/wavpack_enc.c
similarity index 100%
rename from apps/codecs/wavpack_enc.c
rename to lib/rbcodec/codecs/wavpack_enc.c
diff --git a/apps/codecs/wma.c b/lib/rbcodec/codecs/wma.c
similarity index 100%
rename from apps/codecs/wma.c
rename to lib/rbcodec/codecs/wma.c
diff --git a/apps/codecs/wmapro.c b/lib/rbcodec/codecs/wmapro.c
similarity index 100%
rename from apps/codecs/wmapro.c
rename to lib/rbcodec/codecs/wmapro.c
diff --git a/apps/codecs/wmavoice.c b/lib/rbcodec/codecs/wmavoice.c
similarity index 100%
rename from apps/codecs/wmavoice.c
rename to lib/rbcodec/codecs/wmavoice.c
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make
index cd669d22c9..3dfade1826 100644
--- a/lib/rbcodec/rbcodec.make
+++ b/lib/rbcodec/rbcodec.make
@@ -11,9 +11,14 @@ RBCODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/SOURCES)
 RBCODECLIB_OBJ := $(call c2obj, $(RBCODECLIB_SRC))
 RBCODECLIB := $(BUILDDIR)/lib/librbcodec.a
 
-INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
+INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/codecs \
+			-I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
 OTHER_SRC += $(RBCODECLIB_SRC)
 CORE_LIBS += $(RBCODECLIB)
 
 $(RBCODECLIB): $(RBCODECLIB_OBJ)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+
+ifdef SOFTWARECODECS
+  include $(RBCODECLIB_DIR)/codecs/codecs.make
+endif
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index 2c1fb13889..f2234c03b5 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -9,15 +9,14 @@
 
 
 
-RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec
+RBCODECLIB_DIR = $(ROOTDIR)/lib/rbcodec
 RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec
 
 GCCOPTS += -D__PCTOOL__ $(TARGET) -DDEBUG -g -std=gnu99 `$(SDLCONFIG) --cflags` -DCODECDIR="\"$(CODECDIR)\""
 
 SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES)
 
-INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \
-			-I$(ROOTDIR)/apps/gui
+INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/gui
 INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \
 			-I$(ROOTDIR)/firmware/target/hosted \
 			-I$(ROOTDIR)/firmware/target/hosted/sdl
diff --git a/rbutil/rbutilqt/INSTALL b/rbutil/rbutilqt/INSTALL
index 9795a8ede4..2476eb2902 100644
--- a/rbutil/rbutilqt/INSTALL
+++ b/rbutil/rbutilqt/INSTALL
@@ -23,7 +23,7 @@ Requirements:
 - gcc
 - Qt 4.5.0 or later
 - at least the following folders from Rockbox svn:
-  o apps/codecs/libspeex
+  o lib/rbcodec/codecs/libspeex
   o rbutil/
   o tools/
 - libusb (Linux only)
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index e7eff5212f..2dd317032e 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -2,7 +2,7 @@
     <qresource prefix="/">
         <file>../../docs/CREDITS</file>
         <file>../../docs/gpl-2.0.html</file>
-        <file alias="docs/COPYING.SPEEX">../../apps/codecs/libspeex/COPYING</file>
+        <file alias="docs/COPYING.SPEEX">../../lib/rbcodec/codecs/libspeex/COPYING</file>
     </qresource>
     <qresource>
         <file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file>
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 2aa990ac7d..82074016f3 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -486,7 +486,7 @@ STOP
     # Android has codecs installed as native libraries so they are not needed
     # in the zip.
     if ($modelname !~ /android/) {
-        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'apps/codecs');
+        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'lib/rbcodec/codecs');
     }
 
     # remove directory again if no codec was copied
diff --git a/tools/codecscan.pl b/tools/codecscan.pl
index c21295d49f..4f0cbc73af 100755
--- a/tools/codecscan.pl
+++ b/tools/codecscan.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$codecs="apps/codecs";
+$codecs="lib/rbcodec/codecs";
 
 opendir(DIR, $codecs) || die "can't opendir $some_dir: $!";
 my @maps = sort grep { /\.map/ && -f "$codecs/$_" } readdir(DIR);
diff --git a/tools/configure b/tools/configure
index 73639cfb5c..23731530d1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3849,6 +3849,7 @@ export CPU=${t_cpu}
 export MANUFACTURER=${t_manufacturer}
 export OBJDIR=${pwd}
 export BUILDDIR=${pwd}
+export RBCODEC_BLD=${pwd}/lib/rbcodec
 export LANGUAGE=${language}
 export VOICELANGUAGE=${voicelanguage}
 export MEMORYSIZE=${memory}
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 247d25e1db..2435caeaf4 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -11,7 +11,7 @@ ifndef V
 SILENT = @
 endif
 
-SPEEXSRC = ../../apps/codecs/libspeex
+SPEEXSRC = ../../lib/rbcodec/codecs/libspeex
 
 INCLUDES = -I $(SPEEXSRC)
 SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER
diff --git a/tools/root.make b/tools/root.make
index 0fc6c55403..689047e9db 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -101,17 +101,12 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
 else ifneq (,$(findstring warble,$(APP_TYPE)))
   include $(ROOTDIR)/lib/rbcodec/test/warble.make
   include $(ROOTDIR)/lib/tlsf/libtlsf.make
-  include $(APPSDIR)/codecs/codecs.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 else
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
   include $(APPSDIR)/lang/lang.make
 
-  ifdef SOFTWARECODECS
-    include $(APPSDIR)/codecs/codecs.make
-  endif
-
   ifdef ENABLEDPLUGINS
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
@@ -206,7 +201,7 @@ $(LINKROM): $(ROMLDS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
 	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
 		-L$(BUILDDIR)/firmware -lfirmware \
-		-L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+		-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
 		-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
 		-lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
 		-T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
@@ -214,7 +209,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
 $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
 	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
 		-L$(BUILDDIR)/firmware -lfirmware \
-		-L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+		-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
 		-L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
 		-lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
 		-T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
diff --git a/utils/analysis/cmp-plugins-size.py b/utils/analysis/cmp-plugins-size.py
index 05c97486aa..d8f482c017 100755
--- a/utils/analysis/cmp-plugins-size.py
+++ b/utils/analysis/cmp-plugins-size.py
@@ -149,8 +149,8 @@ newver = rb_version(sys.argv[2])
 
 oldplugindir = sys.argv[1] + '/apps/plugins'
 newplugindir = sys.argv[2] + '/apps/plugins'
-oldcodecsdir = sys.argv[1] + '/apps/codecs'
-newcodecsdir = sys.argv[2] + '/apps/codecs'
+oldcodecsdir = sys.argv[1] + '/lib/rbcodec/codecs'
+newcodecsdir = sys.argv[2] + '/lib/rbcodec/codecs'
 
 if os.path.lexists(oldplugindir) and os.path.lexists(newplugindir):
     compare(oldplugindir, newplugindir, oldver, newver)
diff --git a/utils/analysis/find_addr.pl b/utils/analysis/find_addr.pl
index dd42ef6dd8..628fb3dda8 100755
--- a/utils/analysis/find_addr.pl
+++ b/utils/analysis/find_addr.pl
@@ -100,12 +100,12 @@ if($lookaddr != 0)
     close MAKEFILE;
 
     # Generate a list of all codecs
-    open FINDCODECS, "find apps/codecs/ -name '*.elf' 2>&1 |" or die "Can't open pipe: $!";
+    open FINDCODECS, "find lib/rbcodec/codecs/ -name '*.elf' 2>&1 |" or die "Can't open pipe: $!";
     my @codecs;
     while(<FINDCODECS>)
     {
         chomp($_);
-        $_ =~ s/apps\/codecs\///;
+        $_ =~ s/lib\/rbcodec\/codecs\///;
         push(@codecs, $_);
     }
     close FINDCODECS;
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py
index 0a68dbe805..6db45eec4c 100755
--- a/utils/common/deploy-rbutil.py
+++ b/utils/common/deploy-rbutil.py
@@ -26,7 +26,7 @@ deploy.svnpaths = \
              "tools/ucl",
              "tools/rbspeex",
              "utils/imxtools",
-             "apps/codecs/libspeex",
+             "lib/rbcodec/codecs/libspeex",
              "docs/COPYING",
              "docs/gpl-2.0.html",
              "docs/logo/rockbox-clef.svg",