diff --git a/meta-openmoko/packages/libgsmd/libgsmd/default b/meta/packages/libgsmd/libgsmd/default
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/default
rename to meta/packages/libgsmd/libgsmd/default
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/fic-gta01/default b/meta/packages/libgsmd/libgsmd/fic-gta01/default
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/fic-gta01/default
rename to meta/packages/libgsmd/libgsmd/fic-gta01/default
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/getopt-wait-interpreter-ready.patch b/meta/packages/libgsmd/libgsmd/getopt-wait-interpreter-ready.patch
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/getopt-wait-interpreter-ready.patch
rename to meta/packages/libgsmd/libgsmd/getopt-wait-interpreter-ready.patch
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/gsmd b/meta/packages/libgsmd/libgsmd/gsmd
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/gsmd
rename to meta/packages/libgsmd/libgsmd/gsmd
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/htcuniversal/default b/meta/packages/libgsmd/libgsmd/htcuniversal/default
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/htcuniversal/default
rename to meta/packages/libgsmd/libgsmd/htcuniversal/default
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/magician/default b/meta/packages/libgsmd/libgsmd/magician/default
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/magician/default
rename to meta/packages/libgsmd/libgsmd/magician/default
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/no-version.patch b/meta/packages/libgsmd/libgsmd/no-version.patch
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/no-version.patch
rename to meta/packages/libgsmd/libgsmd/no-version.patch
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/tihtc-csq-fix.patch b/meta/packages/libgsmd/libgsmd/tihtc-csq-fix.patch
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/tihtc-csq-fix.patch
rename to meta/packages/libgsmd/libgsmd/tihtc-csq-fix.patch
diff --git a/meta-openmoko/packages/libgsmd/libgsmd/universal-wcdma.patch b/meta/packages/libgsmd/libgsmd/universal-wcdma.patch
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd/universal-wcdma.patch
rename to meta/packages/libgsmd/libgsmd/universal-wcdma.patch
diff --git a/meta-openmoko/packages/libgsmd/libgsmd_svn.bb b/meta/packages/libgsmd/libgsmd_svn.bb
similarity index 100%
rename from meta-openmoko/packages/libgsmd/libgsmd_svn.bb
rename to meta/packages/libgsmd/libgsmd_svn.bb