diff --git a/Makefile.ctr b/Makefile.ctr
index 308c5bf62f..c277d3df77 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -14,16 +14,16 @@ APP_DESCRIPTION      = Retroarch 3DS
 APP_AUTHOR           = Team Libretro
 APP_PRODUCT_CODE     = RETROARCH-3DS
 APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
+APP_ICON             = pkg/ctr/assets/default.png
+APP_BANNER           = pkg/ctr/assets/libretro_banner.png
+APP_AUDIO            = pkg/ctr/assets/silent.wav
+APP_RSF              = pkg/ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
 APP_BIG_TEXT_SECTION = 0
 APP_USE_SVCHAX       = 0
 
-include ctr/Makefile.cores
+include pkg/ctr/Makefile.cores
 
 OBJ :=
 OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
@@ -190,14 +190,14 @@ NM      := $(PREFIX)nm
 LD      := $(CXX)
 
 ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-linux
-	BANNERTOOL = ctr/tools/bannertool-linux
+	MAKEROM    = pkg/ctr/tools/makerom-linux
+	BANNERTOOL = pkg/ctr/tools/bannertool-linux
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-mac
-	BANNERTOOL = ctr/tools/bannertool-mac
+	MAKEROM    = pkg/ctr/tools/makerom-mac
+	BANNERTOOL = pkg/ctr/tools/bannertool-mac
 else
-	MAKEROM    = ctr/tools/makerom.exe
-	BANNERTOOL = ctr/tools/bannertool.exe
+	MAKEROM    = pkg/ctr/tools/makerom.exe
+	BANNERTOOL = pkg/ctr/tools/bannertool.exe
 endif
 
 %.o: %.vsh %.gsh
@@ -228,15 +228,15 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp ctr/big_text_section.xml $(TARGET).xml
+	cp pkg/ctr/big_text_section.xml $(TARGET).xml
 else
 	rm -f $(TARGET).xml
 endif
-	-3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITPRO)/devkitARM/bin/3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index b53a31ff43..930b5badc7 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -11,10 +11,10 @@ APP_DESCRIPTION      = Retroarch 3DS
 APP_AUTHOR           = Team Libretro
 APP_PRODUCT_CODE     = RETROARCH-3DS
 APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
+APP_ICON             = pkg/ctr/assets/default.png
+APP_BANNER           = pkg/ctr/assets/libretro_banner.png
+APP_AUDIO            = pkg/ctr/assets/silent.wav
+APP_RSF              = pkg/ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
 
@@ -44,7 +44,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 endif
 
 ifeq ($(strip $(CTRULIB)),)
-	CTRULIB = $(DEVKITPRO)/ctrulib
+	CTRULIB = $(DEVKITPRO)/libctru
 endif
 
 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
@@ -122,14 +122,14 @@ NM      := $(PREFIX)nm
 LD      := $(CXX)
 
 ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-linux
-	BANNERTOOL = ctr/tools/bannertool-linux
+	MAKEROM    = pkg/ctr/tools/makerom-linux
+	BANNERTOOL = pkg/ctr/tools/bannertool-linux
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-mac
-	BANNERTOOL = ctr/tools/bannertool-mac
+	MAKEROM    = pkg/ctr/tools/makerom-mac
+	BANNERTOOL = pkg/ctr/tools/bannertool-mac
 else
-	MAKEROM    = ctr/tools/makerom.exe
-	BANNERTOOL = ctr/tools/bannertool.exe
+	MAKEROM    = pkg/ctr/tools/makerom.exe
+	BANNERTOOL = pkg/ctr/tools/bannertool.exe
 endif
 
 %.o: %.vsh %.gsh
@@ -160,11 +160,11 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp ctr/big_text_section.xml $(TARGET).xml
+	cp pkg/ctr/big_text_section.xml $(TARGET).xml
 else
 	rm -f $(TARGET).xml
 endif
diff --git a/libretro-db/c_converter b/libretro-db/c_converter
new file mode 100755
index 0000000000..3887af551f
Binary files /dev/null and b/libretro-db/c_converter differ
diff --git a/libretro-db/libretrodb_tool b/libretro-db/libretrodb_tool
new file mode 100755
index 0000000000..6103a09b3c
Binary files /dev/null and b/libretro-db/libretrodb_tool differ
diff --git a/libretro-db/libretrodb_tool.c b/libretro-db/libretrodb_tool.c
index 7e3a09c8af..e137e248e2 100644
--- a/libretro-db/libretrodb_tool.c
+++ b/libretro-db/libretrodb_tool.c
@@ -118,7 +118,7 @@ int main(int argc, char ** argv)
    {
       if (argc != 4)
       {
-         printf("Usage: %s <db file> find-name <query expression>\n", argv[0]);
+         printf("Usage: %s <db file> get-names <query expression>\n", argv[0]);
          goto error;
       }
       
diff --git a/libretro-db/rmsgpack_test b/libretro-db/rmsgpack_test
new file mode 100755
index 0000000000..2f694d014f
Binary files /dev/null and b/libretro-db/rmsgpack_test differ
diff --git a/ctr/Makefile.cores b/pkg/ctr/Makefile.cores
similarity index 52%
rename from ctr/Makefile.cores
rename to pkg/ctr/Makefile.cores
index de64f12c4f..ebf5cf7a5c 100644
--- a/ctr/Makefile.cores
+++ b/pkg/ctr/Makefile.cores
@@ -3,79 +3,79 @@ ifeq ($(LIBRETRO), gambatte)
 	APP_TITLE           = Gambatte Libretro
 	APP_PRODUCT_CODE    = RARCH-GAMBATTE
 	APP_UNIQUE_ID       = 0xBAC01
-	APP_ICON            = ctr/assets/gambatte.png
-	APP_BANNER          = ctr/assets/gambatte_banner.png
+	APP_ICON            = pkg/ctr/assets/gambatte.png
+	APP_BANNER          = pkg/ctr/assets/gambatte_banner.png
 
 else ifeq ($(LIBRETRO), gpsp)
 	APP_TITLE           = gpSP Libretro
 	APP_PRODUCT_CODE    = RARCH-GPSP
 	APP_UNIQUE_ID       = 0xBAC02
-	APP_ICON            = ctr/assets/gpsp.png
-	APP_BANNER          = ctr/assets/gpsp_banner.png
+	APP_ICON            = pkg/ctr/assets/gpsp.png
+	APP_BANNER          = pkg/ctr/assets/gpsp_banner.png
 	APP_USE_SVCHAX      = 1
 
 else ifeq ($(LIBRETRO), fceumm)
 	APP_TITLE           = FCeumm Libretro
 	APP_PRODUCT_CODE    = RARCH-FCEUMM
 	APP_UNIQUE_ID       = 0xBAC03
-	APP_ICON            = ctr/assets/fceumm.png
-	APP_BANNER          = ctr/assets/fceumm_banner.png
+	APP_ICON            = pkg/ctr/assets/fceumm.png
+	APP_BANNER          = pkg/ctr/assets/fceumm_banner.png
 
 else ifeq ($(LIBRETRO), nestopia)
 	APP_TITLE           = Nestopia Libretro
 	APP_PRODUCT_CODE    = RARCH-NESTOPIA
 	APP_UNIQUE_ID       = 0xBAC04
-	APP_ICON            = ctr/assets/nestopia.png
-	APP_BANNER          = ctr/assets/nestopia_banner.png
+	APP_ICON            = pkg/ctr/assets/nestopia.png
+	APP_BANNER          = pkg/ctr/assets/nestopia_banner.png
 
 else ifeq ($(LIBRETRO), nxengine)
 	APP_TITLE           = NXengine Libretro
 	APP_PRODUCT_CODE    = RARCH-NXENGINE
 	APP_UNIQUE_ID       = 0xBAC05
-	APP_ICON            = ctr/assets/nxengine.png
-	APP_BANNER          = ctr/assets/nxengine_banner.png
+	APP_ICON            = pkg/ctr/assets/nxengine.png
+	APP_BANNER          = pkg/ctr/assets/nxengine_banner.png
 
 else ifeq ($(LIBRETRO), genesis_plus_gx)
 	APP_TITLE           = Genesis Plus GX Libretro
 	APP_PRODUCT_CODE    = RARCH-GENPLUSGX
 	APP_UNIQUE_ID       = 0xBAC06
-	APP_ICON            = ctr/assets/genesis_plus_gx.png
-	APP_BANNER          = ctr/assets/genesis_plus_gx_banner.png
+	APP_ICON            = pkg/ctr/assets/genesis_plus_gx.png
+	APP_BANNER          = pkg/ctr/assets/genesis_plus_gx_banner.png
 
 else ifeq ($(LIBRETRO), mednafen_wswan)
 	APP_TITLE           = Mednafen wswan Libretro
 	APP_PRODUCT_CODE    = RARCH-M-WSWAN
 	APP_UNIQUE_ID       = 0xBAC08
-	APP_ICON            = ctr/assets/mednafen_wswan.png
-	APP_BANNER          = ctr/assets/mednafen_wswan_banner.png
+	APP_ICON            = pkg/ctr/assets/mednafen_wswan.png
+	APP_BANNER          = pkg/ctr/assets/mednafen_wswan_banner.png
 
 else ifeq ($(LIBRETRO), mednafen_vb)
 	APP_TITLE           = Mednafen VB Libretro
 	APP_PRODUCT_CODE    = RARCH-M-VB
 	APP_UNIQUE_ID       = 0xBAC09
-	APP_ICON            = ctr/assets/mednafen_vb.png
-	APP_BANNER          = ctr/assets/mednafen_vb_banner.png
+	APP_ICON            = pkg/ctr/assets/mednafen_vb.png
+	APP_BANNER          = pkg/ctr/assets/mednafen_vb_banner.png
 
 else ifeq ($(LIBRETRO), mednafen_ngp)
 	APP_TITLE           = Mednafen NGP Libretro
 	APP_PRODUCT_CODE    = RARCH-M-NGP
 	APP_UNIQUE_ID       = 0xBAC0A
-	APP_ICON            = ctr/assets/mednafen_ngp.png
-	APP_BANNER          = ctr/assets/mednafen_ngp_banner.png
+	APP_ICON            = pkg/ctr/assets/mednafen_ngp.png
+	APP_BANNER          = pkg/ctr/assets/mednafen_ngp_banner.png
 
 else ifeq ($(LIBRETRO), 2048)
 	APP_TITLE           = 2048 Libretro
 	APP_PRODUCT_CODE    = RARCH-2048
 	APP_UNIQUE_ID       = 0xBAC0B
-	APP_ICON            = ctr/assets/2048.png
-	APP_BANNER          = ctr/assets/2048_banner.png
+	APP_ICON            = pkg/ctr/assets/2048.png
+	APP_BANNER          = pkg/ctr/assets/2048_banner.png
 
 else ifeq ($(LIBRETRO), picodrive)
 	APP_TITLE           = Picodrive Libretro
 	APP_PRODUCT_CODE    = RARCH-PICODRIVE
 	APP_UNIQUE_ID       = 0xBAC0C
-	APP_ICON            = ctr/assets/picodrive.png
-	APP_BANNER          = ctr/assets/picodrive_banner.png
+	APP_ICON            = pkg/ctr/assets/picodrive.png
+	APP_BANNER          = pkg/ctr/assets/picodrive_banner.png
 	APP_USE_SVCHAX      = 1
 
 
@@ -84,16 +84,16 @@ else ifeq ($(LIBRETRO), mgba)
 	APP_AUTHOR          = Jeffrey Pfau
 	APP_PRODUCT_CODE    = RARCH-MGBA
 	APP_UNIQUE_ID       = 0xBAC0E
-	APP_ICON            = ctr/assets/mgba.png
-	APP_BANNER          = ctr/assets/mgba_banner.png
+	APP_ICON            = pkg/ctr/assets/mgba.png
+	APP_BANNER          = pkg/ctr/assets/mgba_banner.png
 
 else ifeq ($(LIBRETRO), quicknes)
 	APP_TITLE           = QuickNES Libretro
 	APP_AUTHOR          = blargg, kode54
 	APP_PRODUCT_CODE    = RARCH-QUICKNES
 	APP_UNIQUE_ID       = 0xBAC0F
-	APP_ICON            = ctr/assets/quicknes.png
-	APP_BANNER          = ctr/assets/quicknes_banner.png
+	APP_ICON            = pkg/ctr/assets/quicknes.png
+	APP_BANNER          = pkg/ctr/assets/quicknes_banner.png
 
 else ifeq ($(LIBRETRO), fbalpha2012)
 	APP_TITLE           = Final Burn Alpha 2012
@@ -101,16 +101,16 @@ else ifeq ($(LIBRETRO), fbalpha2012)
 	APP_PRODUCT_CODE    = RARCH-FBA
 	APP_UNIQUE_ID       = 0xBAC17
 	APP_BIG_TEXT_SECTION = 1
-	APP_ICON            = ctr/assets/fbalpha2012.png
-	APP_BANNER          = ctr/assets/fbalpha2012_banner.png
+	APP_ICON            = pkg/ctr/assets/fbalpha2012.png
+	APP_BANNER          = pkg/ctr/assets/fbalpha2012_banner.png
 
 else ifeq ($(LIBRETRO), fbalpha2012_neogeo)
 	APP_TITLE           = Final Burn Alpha 2012 - NeoGeo
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBANEOGEO
 	APP_UNIQUE_ID       = 0xBAC10
-	APP_ICON            = ctr/assets/fbalpha2012_neogeo.png
-	APP_BANNER          = ctr/assets/fbalpha2012_neogeo_banner.png
+	APP_ICON            = pkg/ctr/assets/fbalpha2012_neogeo.png
+	APP_BANNER          = pkg/ctr/assets/fbalpha2012_neogeo_banner.png
 	APP_SYSTEM_MODE     = 80MB
 
 else ifeq ($(LIBRETRO), fbalpha2012_cps1)
@@ -118,16 +118,16 @@ else ifeq ($(LIBRETRO), fbalpha2012_cps1)
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBACPS1
 	APP_UNIQUE_ID       = 0xBAC11
-	APP_ICON            = ctr/assets/fbalpha2012_cps1.png
-	APP_BANNER          = ctr/assets/fbalpha2012_cps1_banner.png
+	APP_ICON            = pkg/ctr/assets/fbalpha2012_cps1.png
+	APP_BANNER          = pkg/ctr/assets/fbalpha2012_cps1_banner.png
 
 else ifeq ($(LIBRETRO), fbalpha2012_cps2)
 	APP_TITLE           = Final Burn Alpha 2012 - CPS-2
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBACPS2
 	APP_UNIQUE_ID       = 0xBAC12
-	APP_ICON            = ctr/assets/fbalpha2012_cps2.png
-	APP_BANNER          = ctr/assets/fbalpha2012_cps2_banner.png
+	APP_ICON            = pkg/ctr/assets/fbalpha2012_cps2.png
+	APP_BANNER          = pkg/ctr/assets/fbalpha2012_cps2_banner.png
 	APP_SYSTEM_MODE     = 80MB
 
 
@@ -136,16 +136,16 @@ else ifeq ($(LIBRETRO), mednafen_pce_fast)
 	APP_AUTHOR          = Ryphecha
 	APP_PRODUCT_CODE    = RARCH-M-PCE-FAST
 	APP_UNIQUE_ID       = 0xBAC14
-	APP_ICON            = ctr/assets/mednafen_pce_fast.png
-	APP_BANNER          = ctr/assets/mednafen_pce_fast_banner.png
+	APP_ICON            = pkg/ctr/assets/mednafen_pce_fast.png
+	APP_BANNER          = pkg/ctr/assets/mednafen_pce_fast_banner.png
 
 else ifeq ($(LIBRETRO), pcsx_rearmed)
 	APP_TITLE           = PCSX ReARMed
 	APP_AUTHOR          = PCSX Team, notaz, Exophase
 	APP_PRODUCT_CODE    = RARCH-PCSXRARMD
 	APP_UNIQUE_ID       = 0xBAC15
-	APP_ICON            = ctr/assets/pcsx_rearmed.png
-	APP_BANNER          = ctr/assets/pcsx_rearmed_banner.png
+	APP_ICON            = pkg/ctr/assets/pcsx_rearmed.png
+	APP_BANNER          = pkg/ctr/assets/pcsx_rearmed_banner.png
 	APP_USE_SVCHAX      = 1
 
 else ifeq ($(LIBRETRO), fmsx)
@@ -153,23 +153,23 @@ else ifeq ($(LIBRETRO), fmsx)
 	APP_AUTHOR          = Marat Fayzullin
 	APP_PRODUCT_CODE    = RARCH-FMSX
 	APP_UNIQUE_ID       = 0xBAC16
-	APP_ICON            = ctr/assets/fmsx.png
-	APP_BANNER          = ctr/assets/fmsx_banner.png
+	APP_ICON            = pkg/ctr/assets/fmsx.png
+	APP_BANNER          = pkg/ctr/assets/fmsx_banner.png
 	
 else ifeq ($(LIBRETRO), mame2000)
 	APP_TITLE           = MAME-2000
 	APP_PRODUCT_CODE    = RARCH-MAME2000
 	APP_UNIQUE_ID       = 0xBAC19
-	APP_ICON            = ctr/assets/mame2000.png
-	APP_BANNER          = ctr/assets/mame2000_banner.png
+	APP_ICON            = pkg/ctr/assets/mame2000.png
+	APP_BANNER          = pkg/ctr/assets/mame2000_banner.png
 	APP_BIG_TEXT_SECTION = 1
 	
 else ifeq ($(LIBRETRO), mame2003)
 	APP_TITLE           = MAME-2003
 	APP_PRODUCT_CODE    = RARCH-MAME2003
 	APP_UNIQUE_ID       = 0xBAC18
-	APP_ICON            = ctr/assets/mame2003.png
-	APP_BANNER          = ctr/assets/mame2003_banner.png
+	APP_ICON            = pkg/ctr/assets/mame2003.png
+	APP_BANNER          = pkg/ctr/assets/mame2003_banner.png
 	APP_BIG_TEXT_SECTION = 1
 
 
@@ -178,36 +178,68 @@ else ifeq ($(LIBRETRO), snes9x2002)
 	APP_AUTHOR          = various
 	APP_PRODUCT_CODE    = RARCH-POCKETSNES
 	APP_UNIQUE_ID       = 0xBAC1A
-	APP_ICON            = ctr/assets/snes9x2002.png
-	APP_BANNER          = ctr/assets/snes9x2002_banner.png
+	APP_ICON            = pkg/ctr/assets/snes9x2002.png
+	APP_BANNER          = pkg/ctr/assets/snes9x2002_banner.png
 
 else ifeq ($(LIBRETRO), snes9x2005)
 	APP_TITLE           = Snes9x 2005
 	APP_PRODUCT_CODE    = RARCH-CATSFC
 	APP_UNIQUE_ID       = 0xBAC07
-	APP_ICON            = ctr/assets/snes9x2005.png
-	APP_BANNER          = ctr/assets/snes9x2005_banner.png
+	APP_ICON            = pkg/ctr/assets/snes9x2005.png
+	APP_BANNER          = pkg/ctr/assets/snes9x2005_banner.png
 
 else ifeq ($(LIBRETRO), snes9x2005_plus)
 	APP_TITLE           = Snes9x 2005 Plus
 	APP_PRODUCT_CODE    = RARCH-CATSFCPLUS
 	APP_UNIQUE_ID       = 0xBAC13
-	APP_ICON            = ctr/assets/snes9x2005_plus.png
-	APP_BANNER          = ctr/assets/snes9x2005_plus_banner.png
+	APP_ICON            = pkg/ctr/assets/snes9x2005_plus.png
+	APP_BANNER          = pkg/ctr/assets/snes9x2005_plus_banner.png
 
 else ifeq ($(LIBRETRO), snes9x2010)
 	APP_TITLE           = Snes9x 2010
 	APP_PRODUCT_CODE    = RARCH-SNES9XNEXT
 	APP_UNIQUE_ID       = 0xBAC0D
-	APP_ICON            = ctr/assets/snes9x2010.png
-	APP_BANNER          = ctr/assets/snes9x2010_banner.png
+	APP_ICON            = pkg/ctr/assets/snes9x2010.png
+	APP_BANNER          = pkg/ctr/assets/snes9x2010_banner.png
 
 else ifeq ($(LIBRETRO), dosbox)
 	APP_TITLE           = DosBox
 	APP_AUTHOR          = various
 	APP_PRODUCT_CODE    = RARCH-DOSBOX
 	APP_UNIQUE_ID       = 0xBAC1B
-	APP_ICON            = ctr/assets/dosbox.png
-	APP_BANNER          = ctr/assets/dosbox_banner.png
+	APP_ICON            = pkg/ctr/assets/dosbox.png
+	APP_BANNER          = pkg/ctr/assets/dosbox_banner.png
+
+else ifeq ($(LIBRETRO), nekop2)
+   APP_TITLE           = Neko Project 2
+   APP_AUTHOR          = various
+   APP_PRODUCT_CODE    = RARCH-NP2
+   APP_UNIQUE_ID       = 0xBAC1C
+   APP_ICON            = pkg/ctr/assets/nekop2.png
+   APP_BANNER          = pkg/ctr/assets/nekop2_banner.png
+
+else ifeq ($(LIBRETRO), np2kai)
+   APP_TITLE           = Neko Project 2 Kai
+   APP_AUTHOR          = various
+   APP_PRODUCT_CODE    = RARCH-NP2KAI
+   APP_UNIQUE_ID       = 0xBAC1D
+   APP_ICON            = pkg/ctr/assets/np2kai.png
+   APP_BANNER          = pkg/ctr/assets/np2kai_banner.png
+
+else ifeq ($(LIBRETRO), 81)
+   APP_TITLE           = lr-81
+   APP_AUTHOR          = various
+   APP_PRODUCT_CODE    = RARCH-81
+   APP_UNIQUE_ID       = 0xBAC1E
+   APP_ICON            = pkg/ctr/assets/81.png
+   APP_BANNER          = pkg/ctr/assets/81_banner.png
+
+else ifeq ($(LIBRETRO), fuse)
+   APP_TITLE           = Fuse
+   APP_AUTHOR          = various
+   APP_PRODUCT_CODE    = RARCH-FUSE
+   APP_UNIQUE_ID       = 0xBAC1F
+   APP_ICON            = pkg/ctr/assets/fuse.png
+   APP_BANNER          = pkg/ctr/assets/fuse_banner.png
 
 endif
diff --git a/ctr/assets/2048.png b/pkg/ctr/assets/2048.png
similarity index 100%
rename from ctr/assets/2048.png
rename to pkg/ctr/assets/2048.png
diff --git a/ctr/assets/2048_banner.png b/pkg/ctr/assets/2048_banner.png
similarity index 100%
rename from ctr/assets/2048_banner.png
rename to pkg/ctr/assets/2048_banner.png
diff --git a/ctr/assets/4do.png b/pkg/ctr/assets/4do.png
similarity index 100%
rename from ctr/assets/4do.png
rename to pkg/ctr/assets/4do.png
diff --git a/ctr/assets/4do_banner.png b/pkg/ctr/assets/4do_banner.png
similarity index 100%
rename from ctr/assets/4do_banner.png
rename to pkg/ctr/assets/4do_banner.png
diff --git a/pkg/ctr/assets/81.png b/pkg/ctr/assets/81.png
new file mode 100644
index 0000000000..b0404d6731
Binary files /dev/null and b/pkg/ctr/assets/81.png differ
diff --git a/pkg/ctr/assets/81_banner.png b/pkg/ctr/assets/81_banner.png
new file mode 100644
index 0000000000..76697a38e1
Binary files /dev/null and b/pkg/ctr/assets/81_banner.png differ
diff --git a/ctr/assets/assets.7z b/pkg/ctr/assets/assets.7z
similarity index 100%
rename from ctr/assets/assets.7z
rename to pkg/ctr/assets/assets.7z
diff --git a/ctr/assets/atari800.png b/pkg/ctr/assets/atari800.png
similarity index 100%
rename from ctr/assets/atari800.png
rename to pkg/ctr/assets/atari800.png
diff --git a/ctr/assets/atari800_banner.png b/pkg/ctr/assets/atari800_banner.png
similarity index 100%
rename from ctr/assets/atari800_banner.png
rename to pkg/ctr/assets/atari800_banner.png
diff --git a/ctr/assets/default.png b/pkg/ctr/assets/default.png
similarity index 100%
rename from ctr/assets/default.png
rename to pkg/ctr/assets/default.png
diff --git a/ctr/assets/dosbox.png b/pkg/ctr/assets/dosbox.png
similarity index 100%
rename from ctr/assets/dosbox.png
rename to pkg/ctr/assets/dosbox.png
diff --git a/ctr/assets/dosbox_banner.png b/pkg/ctr/assets/dosbox_banner.png
similarity index 100%
rename from ctr/assets/dosbox_banner.png
rename to pkg/ctr/assets/dosbox_banner.png
diff --git a/ctr/assets/fbalpha2012.png b/pkg/ctr/assets/fbalpha2012.png
similarity index 100%
rename from ctr/assets/fbalpha2012.png
rename to pkg/ctr/assets/fbalpha2012.png
diff --git a/ctr/assets/fbalpha2012_banner.png b/pkg/ctr/assets/fbalpha2012_banner.png
similarity index 100%
rename from ctr/assets/fbalpha2012_banner.png
rename to pkg/ctr/assets/fbalpha2012_banner.png
diff --git a/ctr/assets/fbalpha2012_cps1.png b/pkg/ctr/assets/fbalpha2012_cps1.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps1.png
rename to pkg/ctr/assets/fbalpha2012_cps1.png
diff --git a/ctr/assets/fbalpha2012_cps1_banner.png b/pkg/ctr/assets/fbalpha2012_cps1_banner.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps1_banner.png
rename to pkg/ctr/assets/fbalpha2012_cps1_banner.png
diff --git a/ctr/assets/fbalpha2012_cps2.png b/pkg/ctr/assets/fbalpha2012_cps2.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps2.png
rename to pkg/ctr/assets/fbalpha2012_cps2.png
diff --git a/ctr/assets/fbalpha2012_cps2_banner.png b/pkg/ctr/assets/fbalpha2012_cps2_banner.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps2_banner.png
rename to pkg/ctr/assets/fbalpha2012_cps2_banner.png
diff --git a/ctr/assets/fbalpha2012_cps3.png b/pkg/ctr/assets/fbalpha2012_cps3.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps3.png
rename to pkg/ctr/assets/fbalpha2012_cps3.png
diff --git a/ctr/assets/fbalpha2012_cps3_banner.png b/pkg/ctr/assets/fbalpha2012_cps3_banner.png
similarity index 100%
rename from ctr/assets/fbalpha2012_cps3_banner.png
rename to pkg/ctr/assets/fbalpha2012_cps3_banner.png
diff --git a/ctr/assets/fbalpha2012_neogeo.png b/pkg/ctr/assets/fbalpha2012_neogeo.png
similarity index 100%
rename from ctr/assets/fbalpha2012_neogeo.png
rename to pkg/ctr/assets/fbalpha2012_neogeo.png
diff --git a/ctr/assets/fbalpha2012_neogeo_banner.png b/pkg/ctr/assets/fbalpha2012_neogeo_banner.png
similarity index 100%
rename from ctr/assets/fbalpha2012_neogeo_banner.png
rename to pkg/ctr/assets/fbalpha2012_neogeo_banner.png
diff --git a/ctr/assets/fceumm.png b/pkg/ctr/assets/fceumm.png
similarity index 100%
rename from ctr/assets/fceumm.png
rename to pkg/ctr/assets/fceumm.png
diff --git a/ctr/assets/fceumm_banner.png b/pkg/ctr/assets/fceumm_banner.png
similarity index 100%
rename from ctr/assets/fceumm_banner.png
rename to pkg/ctr/assets/fceumm_banner.png
diff --git a/ctr/assets/fmsx.png b/pkg/ctr/assets/fmsx.png
similarity index 100%
rename from ctr/assets/fmsx.png
rename to pkg/ctr/assets/fmsx.png
diff --git a/ctr/assets/fmsx_banner.png b/pkg/ctr/assets/fmsx_banner.png
similarity index 100%
rename from ctr/assets/fmsx_banner.png
rename to pkg/ctr/assets/fmsx_banner.png
diff --git a/ctr/assets/fuse.png b/pkg/ctr/assets/fuse.png
similarity index 100%
rename from ctr/assets/fuse.png
rename to pkg/ctr/assets/fuse.png
diff --git a/ctr/assets/fuse_banner.png b/pkg/ctr/assets/fuse_banner.png
similarity index 100%
rename from ctr/assets/fuse_banner.png
rename to pkg/ctr/assets/fuse_banner.png
diff --git a/ctr/assets/gambatte.png b/pkg/ctr/assets/gambatte.png
similarity index 100%
rename from ctr/assets/gambatte.png
rename to pkg/ctr/assets/gambatte.png
diff --git a/ctr/assets/gambatte_banner.png b/pkg/ctr/assets/gambatte_banner.png
similarity index 100%
rename from ctr/assets/gambatte_banner.png
rename to pkg/ctr/assets/gambatte_banner.png
diff --git a/ctr/assets/genesis_plus_gx.png b/pkg/ctr/assets/genesis_plus_gx.png
similarity index 100%
rename from ctr/assets/genesis_plus_gx.png
rename to pkg/ctr/assets/genesis_plus_gx.png
diff --git a/ctr/assets/genesis_plus_gx_banner.png b/pkg/ctr/assets/genesis_plus_gx_banner.png
similarity index 100%
rename from ctr/assets/genesis_plus_gx_banner.png
rename to pkg/ctr/assets/genesis_plus_gx_banner.png
diff --git a/ctr/assets/gpsp.png b/pkg/ctr/assets/gpsp.png
similarity index 100%
rename from ctr/assets/gpsp.png
rename to pkg/ctr/assets/gpsp.png
diff --git a/ctr/assets/gpsp_banner.png b/pkg/ctr/assets/gpsp_banner.png
similarity index 100%
rename from ctr/assets/gpsp_banner.png
rename to pkg/ctr/assets/gpsp_banner.png
diff --git a/ctr/assets/gw.png b/pkg/ctr/assets/gw.png
similarity index 100%
rename from ctr/assets/gw.png
rename to pkg/ctr/assets/gw.png
diff --git a/ctr/assets/gw_banner.png b/pkg/ctr/assets/gw_banner.png
similarity index 100%
rename from ctr/assets/gw_banner.png
rename to pkg/ctr/assets/gw_banner.png
diff --git a/ctr/assets/handy.png b/pkg/ctr/assets/handy.png
similarity index 100%
rename from ctr/assets/handy.png
rename to pkg/ctr/assets/handy.png
diff --git a/ctr/assets/handy_banner.png b/pkg/ctr/assets/handy_banner.png
similarity index 100%
rename from ctr/assets/handy_banner.png
rename to pkg/ctr/assets/handy_banner.png
diff --git a/ctr/assets/libretro_banner.png b/pkg/ctr/assets/libretro_banner.png
similarity index 100%
rename from ctr/assets/libretro_banner.png
rename to pkg/ctr/assets/libretro_banner.png
diff --git a/pkg/ctr/assets/libretro_neutral_shaded_banner.png b/pkg/ctr/assets/libretro_neutral_shaded_banner.png
new file mode 100644
index 0000000000..dbfa96dd4a
Binary files /dev/null and b/pkg/ctr/assets/libretro_neutral_shaded_banner.png differ
diff --git a/ctr/assets/mame2000.png b/pkg/ctr/assets/mame2000.png
similarity index 100%
rename from ctr/assets/mame2000.png
rename to pkg/ctr/assets/mame2000.png
diff --git a/ctr/assets/mame2000_banner.png b/pkg/ctr/assets/mame2000_banner.png
similarity index 100%
rename from ctr/assets/mame2000_banner.png
rename to pkg/ctr/assets/mame2000_banner.png
diff --git a/ctr/assets/mame2003.png b/pkg/ctr/assets/mame2003.png
similarity index 100%
rename from ctr/assets/mame2003.png
rename to pkg/ctr/assets/mame2003.png
diff --git a/ctr/assets/mame2003_banner.png b/pkg/ctr/assets/mame2003_banner.png
similarity index 100%
rename from ctr/assets/mame2003_banner.png
rename to pkg/ctr/assets/mame2003_banner.png
diff --git a/ctr/assets/mednafen_ngp.png b/pkg/ctr/assets/mednafen_ngp.png
similarity index 100%
rename from ctr/assets/mednafen_ngp.png
rename to pkg/ctr/assets/mednafen_ngp.png
diff --git a/ctr/assets/mednafen_ngp_banner.png b/pkg/ctr/assets/mednafen_ngp_banner.png
similarity index 100%
rename from ctr/assets/mednafen_ngp_banner.png
rename to pkg/ctr/assets/mednafen_ngp_banner.png
diff --git a/ctr/assets/mednafen_pce_fast.png b/pkg/ctr/assets/mednafen_pce_fast.png
similarity index 100%
rename from ctr/assets/mednafen_pce_fast.png
rename to pkg/ctr/assets/mednafen_pce_fast.png
diff --git a/ctr/assets/mednafen_pce_fast_banner.png b/pkg/ctr/assets/mednafen_pce_fast_banner.png
similarity index 100%
rename from ctr/assets/mednafen_pce_fast_banner.png
rename to pkg/ctr/assets/mednafen_pce_fast_banner.png
diff --git a/ctr/assets/mednafen_vb.png b/pkg/ctr/assets/mednafen_vb.png
similarity index 100%
rename from ctr/assets/mednafen_vb.png
rename to pkg/ctr/assets/mednafen_vb.png
diff --git a/ctr/assets/mednafen_vb_banner.png b/pkg/ctr/assets/mednafen_vb_banner.png
similarity index 100%
rename from ctr/assets/mednafen_vb_banner.png
rename to pkg/ctr/assets/mednafen_vb_banner.png
diff --git a/ctr/assets/mednafen_wswan.png b/pkg/ctr/assets/mednafen_wswan.png
similarity index 100%
rename from ctr/assets/mednafen_wswan.png
rename to pkg/ctr/assets/mednafen_wswan.png
diff --git a/ctr/assets/mednafen_wswan_banner.png b/pkg/ctr/assets/mednafen_wswan_banner.png
similarity index 100%
rename from ctr/assets/mednafen_wswan_banner.png
rename to pkg/ctr/assets/mednafen_wswan_banner.png
diff --git a/ctr/assets/mgba.png b/pkg/ctr/assets/mgba.png
similarity index 100%
rename from ctr/assets/mgba.png
rename to pkg/ctr/assets/mgba.png
diff --git a/ctr/assets/mgba_banner.png b/pkg/ctr/assets/mgba_banner.png
similarity index 100%
rename from ctr/assets/mgba_banner.png
rename to pkg/ctr/assets/mgba_banner.png
diff --git a/pkg/ctr/assets/nekop2.png b/pkg/ctr/assets/nekop2.png
new file mode 100644
index 0000000000..d7695ba10e
Binary files /dev/null and b/pkg/ctr/assets/nekop2.png differ
diff --git a/pkg/ctr/assets/nekop2_banner.png b/pkg/ctr/assets/nekop2_banner.png
new file mode 100644
index 0000000000..c97662eb6e
Binary files /dev/null and b/pkg/ctr/assets/nekop2_banner.png differ
diff --git a/ctr/assets/nestopia.png b/pkg/ctr/assets/nestopia.png
similarity index 100%
rename from ctr/assets/nestopia.png
rename to pkg/ctr/assets/nestopia.png
diff --git a/ctr/assets/nestopia_banner.png b/pkg/ctr/assets/nestopia_banner.png
similarity index 100%
rename from ctr/assets/nestopia_banner.png
rename to pkg/ctr/assets/nestopia_banner.png
diff --git a/pkg/ctr/assets/np2kai.png b/pkg/ctr/assets/np2kai.png
new file mode 100644
index 0000000000..d7695ba10e
Binary files /dev/null and b/pkg/ctr/assets/np2kai.png differ
diff --git a/pkg/ctr/assets/np2kai_banner.png b/pkg/ctr/assets/np2kai_banner.png
new file mode 100644
index 0000000000..83a82db0f6
Binary files /dev/null and b/pkg/ctr/assets/np2kai_banner.png differ
diff --git a/ctr/assets/nxengine.png b/pkg/ctr/assets/nxengine.png
similarity index 100%
rename from ctr/assets/nxengine.png
rename to pkg/ctr/assets/nxengine.png
diff --git a/ctr/assets/nxengine_banner.png b/pkg/ctr/assets/nxengine_banner.png
similarity index 100%
rename from ctr/assets/nxengine_banner.png
rename to pkg/ctr/assets/nxengine_banner.png
diff --git a/ctr/assets/o2em.png b/pkg/ctr/assets/o2em.png
similarity index 100%
rename from ctr/assets/o2em.png
rename to pkg/ctr/assets/o2em.png
diff --git a/ctr/assets/o2em_banner.png b/pkg/ctr/assets/o2em_banner.png
similarity index 100%
rename from ctr/assets/o2em_banner.png
rename to pkg/ctr/assets/o2em_banner.png
diff --git a/ctr/assets/pcsx_rearmed.png b/pkg/ctr/assets/pcsx_rearmed.png
similarity index 100%
rename from ctr/assets/pcsx_rearmed.png
rename to pkg/ctr/assets/pcsx_rearmed.png
diff --git a/ctr/assets/pcsx_rearmed_banner.png b/pkg/ctr/assets/pcsx_rearmed_banner.png
similarity index 100%
rename from ctr/assets/pcsx_rearmed_banner.png
rename to pkg/ctr/assets/pcsx_rearmed_banner.png
diff --git a/ctr/assets/picodrive.png b/pkg/ctr/assets/picodrive.png
similarity index 100%
rename from ctr/assets/picodrive.png
rename to pkg/ctr/assets/picodrive.png
diff --git a/ctr/assets/picodrive_banner.png b/pkg/ctr/assets/picodrive_banner.png
similarity index 100%
rename from ctr/assets/picodrive_banner.png
rename to pkg/ctr/assets/picodrive_banner.png
diff --git a/ctr/assets/prosystem.png b/pkg/ctr/assets/prosystem.png
similarity index 100%
rename from ctr/assets/prosystem.png
rename to pkg/ctr/assets/prosystem.png
diff --git a/ctr/assets/prosystem_banner.png b/pkg/ctr/assets/prosystem_banner.png
similarity index 100%
rename from ctr/assets/prosystem_banner.png
rename to pkg/ctr/assets/prosystem_banner.png
diff --git a/ctr/assets/quicknes.png b/pkg/ctr/assets/quicknes.png
similarity index 100%
rename from ctr/assets/quicknes.png
rename to pkg/ctr/assets/quicknes.png
diff --git a/ctr/assets/quicknes_banner.png b/pkg/ctr/assets/quicknes_banner.png
similarity index 100%
rename from ctr/assets/quicknes_banner.png
rename to pkg/ctr/assets/quicknes_banner.png
diff --git a/ctr/assets/silent.wav b/pkg/ctr/assets/silent.wav
similarity index 100%
rename from ctr/assets/silent.wav
rename to pkg/ctr/assets/silent.wav
diff --git a/ctr/assets/snes9x2002.png b/pkg/ctr/assets/snes9x2002.png
similarity index 100%
rename from ctr/assets/snes9x2002.png
rename to pkg/ctr/assets/snes9x2002.png
diff --git a/ctr/assets/snes9x2002_banner.png b/pkg/ctr/assets/snes9x2002_banner.png
similarity index 100%
rename from ctr/assets/snes9x2002_banner.png
rename to pkg/ctr/assets/snes9x2002_banner.png
diff --git a/ctr/assets/snes9x2005.png b/pkg/ctr/assets/snes9x2005.png
similarity index 100%
rename from ctr/assets/snes9x2005.png
rename to pkg/ctr/assets/snes9x2005.png
diff --git a/ctr/assets/snes9x2005_banner.png b/pkg/ctr/assets/snes9x2005_banner.png
similarity index 100%
rename from ctr/assets/snes9x2005_banner.png
rename to pkg/ctr/assets/snes9x2005_banner.png
diff --git a/ctr/assets/snes9x2005_plus.png b/pkg/ctr/assets/snes9x2005_plus.png
similarity index 100%
rename from ctr/assets/snes9x2005_plus.png
rename to pkg/ctr/assets/snes9x2005_plus.png
diff --git a/ctr/assets/snes9x2005_plus_banner.png b/pkg/ctr/assets/snes9x2005_plus_banner.png
similarity index 100%
rename from ctr/assets/snes9x2005_plus_banner.png
rename to pkg/ctr/assets/snes9x2005_plus_banner.png
diff --git a/ctr/assets/snes9x2010.png b/pkg/ctr/assets/snes9x2010.png
similarity index 100%
rename from ctr/assets/snes9x2010.png
rename to pkg/ctr/assets/snes9x2010.png
diff --git a/ctr/assets/snes9x2010_banner.png b/pkg/ctr/assets/snes9x2010_banner.png
similarity index 100%
rename from ctr/assets/snes9x2010_banner.png
rename to pkg/ctr/assets/snes9x2010_banner.png
diff --git a/ctr/assets/stella.png b/pkg/ctr/assets/stella.png
similarity index 100%
rename from ctr/assets/stella.png
rename to pkg/ctr/assets/stella.png
diff --git a/ctr/assets/stella_banner.png b/pkg/ctr/assets/stella_banner.png
similarity index 100%
rename from ctr/assets/stella_banner.png
rename to pkg/ctr/assets/stella_banner.png
diff --git a/ctr/assets/vecx.png b/pkg/ctr/assets/vecx.png
similarity index 100%
rename from ctr/assets/vecx.png
rename to pkg/ctr/assets/vecx.png
diff --git a/ctr/assets/vecx_banner.png b/pkg/ctr/assets/vecx_banner.png
similarity index 100%
rename from ctr/assets/vecx_banner.png
rename to pkg/ctr/assets/vecx_banner.png
diff --git a/ctr/assets/virtualjaguar.png b/pkg/ctr/assets/virtualjaguar.png
similarity index 100%
rename from ctr/assets/virtualjaguar.png
rename to pkg/ctr/assets/virtualjaguar.png
diff --git a/ctr/assets/virtualjaguar_banner.png b/pkg/ctr/assets/virtualjaguar_banner.png
similarity index 100%
rename from ctr/assets/virtualjaguar_banner.png
rename to pkg/ctr/assets/virtualjaguar_banner.png
diff --git a/ctr/assets/yabause.png b/pkg/ctr/assets/yabause.png
similarity index 100%
rename from ctr/assets/yabause.png
rename to pkg/ctr/assets/yabause.png
diff --git a/ctr/assets/yabause_banner.png b/pkg/ctr/assets/yabause_banner.png
similarity index 100%
rename from ctr/assets/yabause_banner.png
rename to pkg/ctr/assets/yabause_banner.png
diff --git a/ctr/big_text_section.xml b/pkg/ctr/big_text_section.xml
similarity index 100%
rename from ctr/big_text_section.xml
rename to pkg/ctr/big_text_section.xml
diff --git a/ctr/tools/bannertool-linux b/pkg/ctr/tools/bannertool-linux
similarity index 100%
rename from ctr/tools/bannertool-linux
rename to pkg/ctr/tools/bannertool-linux
diff --git a/ctr/tools/bannertool-mac b/pkg/ctr/tools/bannertool-mac
similarity index 100%
rename from ctr/tools/bannertool-mac
rename to pkg/ctr/tools/bannertool-mac
diff --git a/ctr/tools/bannertool.exe b/pkg/ctr/tools/bannertool.exe
similarity index 100%
rename from ctr/tools/bannertool.exe
rename to pkg/ctr/tools/bannertool.exe
diff --git a/ctr/tools/makerom-linux b/pkg/ctr/tools/makerom-linux
similarity index 100%
rename from ctr/tools/makerom-linux
rename to pkg/ctr/tools/makerom-linux
diff --git a/ctr/tools/makerom-mac b/pkg/ctr/tools/makerom-mac
similarity index 100%
rename from ctr/tools/makerom-mac
rename to pkg/ctr/tools/makerom-mac
diff --git a/ctr/tools/makerom.exe b/pkg/ctr/tools/makerom.exe
similarity index 100%
rename from ctr/tools/makerom.exe
rename to pkg/ctr/tools/makerom.exe
diff --git a/ctr/tools/template.rsf b/pkg/ctr/tools/template.rsf
similarity index 100%
rename from ctr/tools/template.rsf
rename to pkg/ctr/tools/template.rsf