diff --git a/Makefile.pandora b/Makefile.pandora
index 1e3194ba18..5c6da85a7f 100644
--- a/Makefile.pandora
+++ b/Makefile.pandora
@@ -2,7 +2,7 @@
 # $ source /usr/local/angstrom/arm/environment-setup
 # $ setprj retroarch
 
-PNDDIR=./pandora
+PNDDIR=./pkg/pandora
 BINDIR=$(PNDDIR)/bin
 
 all: $(BINDIR)/retroarch
diff --git a/pandora/PXML.xml b/pkg/pandora/PXML.xml
similarity index 100%
rename from pandora/PXML.xml
rename to pkg/pandora/PXML.xml
diff --git a/pandora/icon.png b/pkg/pandora/icon.png
similarity index 100%
rename from pandora/icon.png
rename to pkg/pandora/icon.png
diff --git a/pandora/previews/retroarch-phoenix.png b/pkg/pandora/previews/retroarch-phoenix.png
similarity index 100%
rename from pandora/previews/retroarch-phoenix.png
rename to pkg/pandora/previews/retroarch-phoenix.png
diff --git a/pandora/previews/retroarch.png b/pkg/pandora/previews/retroarch.png
similarity index 100%
rename from pandora/previews/retroarch.png
rename to pkg/pandora/previews/retroarch.png
diff --git a/pandora/retroarch/phoenix.cfg b/pkg/pandora/retroarch/phoenix.cfg
similarity index 100%
rename from pandora/retroarch/phoenix.cfg
rename to pkg/pandora/retroarch/phoenix.cfg
diff --git a/pandora/retroarch/retroarch.cfg b/pkg/pandora/retroarch/retroarch.cfg
similarity index 100%
rename from pandora/retroarch/retroarch.cfg
rename to pkg/pandora/retroarch/retroarch.cfg
diff --git a/pandora/scripts/env-vars.sh b/pkg/pandora/scripts/env-vars.sh
similarity index 100%
rename from pandora/scripts/env-vars.sh
rename to pkg/pandora/scripts/env-vars.sh
diff --git a/pandora/scripts/retroarch-phoenix.sh b/pkg/pandora/scripts/retroarch-phoenix.sh
similarity index 100%
rename from pandora/scripts/retroarch-phoenix.sh
rename to pkg/pandora/scripts/retroarch-phoenix.sh
diff --git a/pandora/scripts/retroarch.sh b/pkg/pandora/scripts/retroarch.sh
similarity index 100%
rename from pandora/scripts/retroarch.sh
rename to pkg/pandora/scripts/retroarch.sh